CC
diff --git a/src/main/java/pta/de/core/controller/ServicesConfigCache.java b/src/main/java/pta/de/core/controller/ServicesConfigCache.java
index 0fb4435..47b50b6 100644
--- a/src/main/java/pta/de/core/controller/ServicesConfigCache.java
+++ b/src/main/java/pta/de/core/controller/ServicesConfigCache.java
@@ -4,7 +4,6 @@
import org.apache.log4j.Logger;
import org.eclipse.jetty.http.HttpStatus;
import pta.de.api.ServiceDistributionCluster;
-
import pta.de.core.exceptions.HttpStatusException;
import javax.validation.ConstraintViolation;
@@ -19,8 +18,8 @@
public class ServicesConfigCache {
private static final Logger logger = Logger.getLogger(ServicesConfigCache.class.getName());
- private static final ServicesConfigCache SERIVCECONFIGCACHE_INSTANCE = new ServicesConfigCache();
- private String criticalSection = "CRITICAL_SECTION";
+ private static ServicesConfigCache instance = new ServicesConfigCache();
+
private ServiceDistributionCluster[] cache;
@@ -28,7 +27,7 @@
}
public static ServicesConfigCache getInstance() {
- return SERIVCECONFIGCACHE_INSTANCE;
+ return instance;
}
@@ -60,7 +59,7 @@
for (ServiceDistributionCluster item : dcs) {
Set<ConstraintViolation<ServiceDistributionCluster>> violations
= validator.validate(item);
- if (violations.size() > 0) {
+ if (!violations.isEmpty()) {
logger.error("Error in configfile!: ");
throw new HttpStatusException(HttpStatus.INTERNAL_SERVER_ERROR_500);
}
diff --git a/src/test/java/pta/de/core/controller/ServicesConfigCacheTimerTaskTest.java b/src/test/java/pta/de/core/controller/ServicesConfigCacheTimerTaskTest.java
index ac6c124..cde3a90 100644
--- a/src/test/java/pta/de/core/controller/ServicesConfigCacheTimerTaskTest.java
+++ b/src/test/java/pta/de/core/controller/ServicesConfigCacheTimerTaskTest.java
@@ -1,34 +1,34 @@
package pta.de.core.controller;
-import org.apache.log4j.Logger;
import org.easymock.EasyMock;
import org.eclipse.jetty.http.HttpStatus;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.powermock.reflect.Whitebox;
import pta.de.core.exceptions.HttpStatusException;
-import javax.validation.constraints.AssertTrue;
-
import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertTrue;
public class ServicesConfigCacheTimerTaskTest {
+ private static ServicesConfigCache saveScc;
+
+ @BeforeClass
+ public static void SaveState() {
+ saveScc = Whitebox.getInternalState(ServicesConfigCache.class, "SERIVCECONFIGCACHE_INSTANCE");
+
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ Whitebox.setInternalState(ServicesConfigCache.class, "SERIVCECONFIGCACHE_INSTANCE", saveScc);
+ }
+
@Test
public void testRun() throws HttpStatusException {
// ------------------ Prepare Test ----------------------
final String EXCEPTION_TEXT = "Exception";
- Logger localLogger = EasyMock.createMock(Logger.class);
- localLogger.error(anyString(), anyObject());
- expectLastCall().andThrow(new RuntimeException("Error Logged!"));
-
- localLogger.debug(anyString());
- expectLastCall().anyTimes();
-
- replay(localLogger);
-
- Whitebox.setInternalState(ServicesConfigCacheTimerTask.class, "logger", localLogger);
-
ServicesConfigCache scc = EasyMock.createMock(ServicesConfigCache.class);
scc.readServerDistribution(eq(EXCEPTION_TEXT));
expectLastCall().andThrow(new HttpStatusException(HttpStatus.INTERNAL_SERVER_ERROR_500)).anyTimes();
@@ -43,20 +43,14 @@
// ---------------------------- Test it ------------------------------------------
ServicesConfigCacheTimerTask task = new ServicesConfigCacheTimerTask(EXCEPTION_TEXT);
- boolean exceptionThrown = false;
- // this runs into the exception block
- try {
- task.run();
- }
- catch( RuntimeException re ) {
- exceptionThrown = true;
- }
- assertTrue( exceptionThrown );
+ task.run();
// should run without problems
ServicesConfigCacheTimerTask task2 = new ServicesConfigCacheTimerTask("No Error");
task2.run();
+
+ tearDown();
}
}
