test coverage for commons module

commons/src/main/java/lcsb/mapviewer/common/EventStorageLoggerAppender.java

@@ -81,7 +81,6 @@ public class EventStorageLoggerAppender extends AppenderSkeleton {
 
 	@Override
 	protected void append(LoggingEvent event) {
-
 		// store information for all thread only if it is flagged by
 		// currentThreadLogOnly, if not only logs from current thread should be
 		// stored

commons/src/test/java/lcsb/mapviewer/common/CommonTestFunctions.java

+package lcsb.mapviewer.common;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
+import org.junit.After;
+import org.junit.Before;
+
+import lcsb.mapviewer.common.EventStorageLoggerAppender;
+
+public class CommonTestFunctions {
+
+	private EventStorageLoggerAppender appender;
+
+	@Before
+	public final void _setUp() throws Exception {
+		Logger.getRootLogger().removeAppender(appender);
+		appender = new EventStorageLoggerAppender();
+		Logger.getRootLogger().addAppender(appender);
+	}
+
+	@After
+	public final void _tearDown() throws Exception {
+		Logger.getRootLogger().removeAppender(appender);
+	}
+
+	protected List<LoggingEvent> getWarnings() {
+		return appender.getWarnings();
+	}
+
+	protected List<LoggingEvent> getErrors() {
+		return appender.getErrors();
+	}
+
+}

commons/src/test/java/lcsb/mapviewer/common/ConfigurationTest.java

@@ -7,11 +7,14 @@ import static org.junit.Assert.assertNotNull;
 import java.io.File;
 import java.lang.reflect.Constructor;
 
+import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-public class ConfigurationTest {
+public class ConfigurationTest extends CommonTestFunctions{
+
+	Logger logger = Logger.getLogger(ConfigurationTest.class);
 
 	@Before
 	public void setUp() throws Exception {
@@ -41,7 +44,7 @@ public class ConfigurationTest {
 
 	@Test
 	public void testLoadSystemBuildVersion2() {
-		Configuration.loadSystemVersion((String)null);
+		Configuration.loadSystemVersion((String) null);
 		Configuration.loadSystemVersion(new File("unknown.xxx"));
 		assertEquals("Unknown", Configuration.getSystemBuildVersion(null));
 		assertEquals("Unknown", Configuration.getSystemBuild(null));
@@ -52,7 +55,7 @@ public class ConfigurationTest {
 	public void testGetSystemBuildVersion() {
 		assertEquals("100", Configuration.getSystemBuildVersion("testFiles/version/", true));
 		assertEquals("100", Configuration.getSystemBuildVersion(null, false));
-		assertEquals("101", Configuration.getSystemVersion("testFiles/version/",true));
+		assertEquals("101", Configuration.getSystemVersion("testFiles/version/", true));
 	}
 
 	@Test
@@ -75,6 +78,39 @@ public class ConfigurationTest {
 		assertEquals(dir, Configuration.getWebAppDir());
 	}
 
+
+	@Test
+	public void testLoadInvalidSystemBuildVersion() {
+		Configuration.loadSystemBuildVersion(new File("invalid_path"));
+		assertEquals(1, super.getErrors().size());
+	}
+
+	@Test
+	public void testLoadInvalidSystemVersion() {
+		Configuration.loadSystemVersion(new File("testFiles/version/INVALID_CHANGELOG"));
+		assertEquals(1, super.getErrors().size());
+	}
+
+	@Test
+	public void testGetFrameworkVersion() {
+		FrameworkVersion version = Configuration.getFrameworkVersion(null);
+		assertEquals("Unknown", version.getGitVersion());
+		assertEquals("Unknown", version.getTime());
+		assertEquals("Unknown", version.getVersion());
+	}
+
+	@Test
+	public void testGetMemorySaturationRatioTriggerClean() {
+		double newRatio = 33;
+		double oldRatio = Configuration.getMemorySaturationRatioTriggerClean();
+		try {
+			Configuration.setMemorySaturationRatioTriggerClean(newRatio);
+			assertEquals(newRatio, Configuration.getMemorySaturationRatioTriggerClean(), Configuration.EPSILON);
+		} finally {
+			Configuration.setMemorySaturationRatioTriggerClean(oldRatio);
+		}
+	}
+
 	@Test
 	public void testPrivateConstructor() throws Exception {
 		try {

commons/src/test/java/lcsb/mapviewer/common/EventStorageLoggerAppenderTest.java

@@ -33,7 +33,10 @@ public class EventStorageLoggerAppenderTest {
 			logger.error("2");
 			logger.info("3");
 			logger.fatal("4");
+			logger.trace("5");
 			assertEquals(1, appender.getWarnings().size());
+			assertEquals(1, appender.getFatals().size());
+			assertEquals(1, appender.getErrors().size());
 			logger.removeAppender(appender);
 			logger.warn("test");
 			assertEquals(1, appender.getWarnings().size());

commons/src/test/resources/log4j.properties

-#Set root logger 's level and its appender to an appender called CONSOLE which is defined below.
-log4j.rootLogger=info, CONSOLE, R
-
-#Set the behavior of the CONSOLE appender 
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d %5p [%t] (%F:%L) - %m%n
-#log4j.appender.CONSOLE.layout.ConversionPattern=%m%n
-
-
-#Set the behavior of the FILE appender 
-log4j.appender.R=org.apache.log4j.FileAppender
-log4j.appender.R.File=${catalina.home}/logs/MapViewer.log
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%d %5p [%t] (%F:%L) - %m%n
-
-
-log4j.logger.org.springframework=warn
-log4j.logger.org.hibernate=warn
-log4j.logger.lcsb=debug
+#Set root logger 's level and its appender to an appender called CONSOLE which is defined below.
+log4j.rootLogger=info, CONSOLE, R
+
+#Set the behavior of the CONSOLE appender 
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d %5p [%t] (%F:%L) - %m%n
+#log4j.appender.CONSOLE.layout.ConversionPattern=%m%n
+
+
+#Set the behavior of the FILE appender 
+log4j.appender.R=org.apache.log4j.FileAppender
+log4j.appender.R.File=${catalina.home}/logs/MapViewer.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %5p [%t] (%F:%L) - %m%n
+
+
+log4j.logger.org.springframework=warn
+log4j.logger.org.hibernate=warn
+log4j.logger.lcsb=trace

commons/testFiles/version/INVALID_CHANGELOG

+blablabla
\ No newline at end of file