diff --git a/commons/src/main/java/lcsb/mapviewer/common/EventStorageLoggerAppender.java b/commons/src/main/java/lcsb/mapviewer/common/EventStorageLoggerAppender.java
index 402e0437f505d75c6b34b3c0f00daf4462228aa9..94818d2c1ddb88ea6d17a09039de60c2e112c52d 100644
--- a/commons/src/main/java/lcsb/mapviewer/common/EventStorageLoggerAppender.java
+++ b/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
diff --git a/commons/src/test/java/lcsb/mapviewer/common/CommonTestFunctions.java b/commons/src/test/java/lcsb/mapviewer/common/CommonTestFunctions.java
new file mode 100644
index 0000000000000000000000000000000000000000..f002f8cad23fdd1bbe38515ea86d2586e3c47d03
--- /dev/null
+++ b/commons/src/test/java/lcsb/mapviewer/common/CommonTestFunctions.java
@@ -0,0 +1,36 @@
+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();
+ }
+
+}
diff --git a/commons/src/test/java/lcsb/mapviewer/common/ConfigurationTest.java b/commons/src/test/java/lcsb/mapviewer/common/ConfigurationTest.java
index ac518fde1d53bf5fa70a16a142c8b5a5dae40d41..9daf7394373f94c19705081f3f4ed836bfb5fe91 100644
--- a/commons/src/test/java/lcsb/mapviewer/common/ConfigurationTest.java
+++ b/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 {
diff --git a/commons/src/test/java/lcsb/mapviewer/common/EventStorageLoggerAppenderTest.java b/commons/src/test/java/lcsb/mapviewer/common/EventStorageLoggerAppenderTest.java
index 9816f4b8aab08b9416ace661da88ea4b95fc72bb..8d09a890f94c615f660fd4bc3259940e304d8355 100644
--- a/commons/src/test/java/lcsb/mapviewer/common/EventStorageLoggerAppenderTest.java
+++ b/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());
diff --git a/commons/src/test/resources/log4j.properties b/commons/src/test/resources/log4j.properties
index 6fb98fb560e3f549d02eea0aad1200b1ec84b7e6..3afa80683dc551478d473a4f394d9df11ee83371 100644
--- a/commons/src/test/resources/log4j.properties
+++ b/commons/src/test/resources/log4j.properties
@@ -1,20 +1,20 @@
-#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
diff --git a/commons/testFiles/version/INVALID_CHANGELOG b/commons/testFiles/version/INVALID_CHANGELOG
new file mode 100644
index 0000000000000000000000000000000000000000..bdf68551202da8f4ecd0c7ed8db8a6aeee492556
--- /dev/null
+++ b/commons/testFiles/version/INVALID_CHANGELOG
@@ -0,0 +1 @@
+blablabla
\ No newline at end of file