use an empty() config as standard instead of null

zapodot · Aug 18, 2014 · 4240951 · 4240951
1 parent 9262b72
commit 4240951
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/main/java/org/zapodot/akka/junit/ActorSystemRuleBuilder.java b/src/main/java/org/zapodot/akka/junit/ActorSystemRuleBuilder.java
@@ -104,7 +104,7 @@ public ActorSystemRuleBuilder setConfigFromString(final String configString) {
 
     Config currentConfig() {
         if(this.config == null) {
-            return null;
+            return ConfigFactory.empty();
         } else {
             return ConfigFactory.empty().withFallback(config);
         }

diff --git a/src/test/java/org/zapodot/akka/junit/ActorSystemRuleBuilderTest.java b/src/test/java/org/zapodot/akka/junit/ActorSystemRuleBuilderTest.java
@@ -3,6 +3,7 @@
 import akka.event.slf4j.Slf4jLogger;
 import akka.testkit.TestEventListener;
 import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -18,6 +19,26 @@ public void testEnableEventListener() throws Exception {
 
     }
 
+    @Test
+    public void testEmptyConfig() throws Exception {
+
+        assertEquals(ConfigFactory.empty(), ActorSystemRule.builder().currentConfig());
+    }
+
+    @Test
+    public void testAddExistingConfig() throws Exception {
+        assertEquals(ConfigFactory.empty(), ActorSystemRule.builder().setConfig(ConfigFactory.empty()).currentConfig());
+    }
+
+    @Test
+    public void testAddExistingConfigTwice() throws Exception {
+        assertEquals(ConfigFactory.empty(),
+                     ActorSystemRule.builder()
+                                    .setConfig(ConfigFactory.empty())
+                                    .setConfig(ConfigFactory.empty())
+                                    .currentConfig());
+    }
+
     @Test
     public void testEnableEventLogging() throws Exception {
         final ActorSystemRuleBuilder actorSystemRuleBuilder = ActorSystemRule.builder().enableEventLogging();
@@ -32,9 +53,24 @@ public void testEnableReceiveDebugLogging() throws Exception {
                 "akka.actor.debug.receive"));
     }
 
+
     @Test
     public void testEnableLifecycleDebugLogging() throws Exception {
-        assertEquals("on", ActorSystemRule.builder().enableLifecycleDebugLogging().currentConfig().getString("akka.actor.debug.lifecycle"));
+        assertEquals("on",
+                     ActorSystemRule.builder()
+                                    .enableLifecycleDebugLogging()
+                                    .currentConfig()
+                                    .getString("akka.actor.debug.lifecycle"));
+
+    }
+
+    @Test
+    public void testEnableLifecycleAndReceiveDebugLogging() throws Exception {
+        final Config config = ActorSystemRule.builder()
+                                             .enableLifecycleDebugLogging()
+                                             .enableReceiveDebugLogging().currentConfig();
+        assertEquals("on", config.getString("akka.actor.debug.lifecycle"));
+        assertEquals("on", config.getString("akka.actor.debug.receive"));
 
     }
 }