Fix NPE in EntityOwnerSelectionStrategyConfigReader

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / entityownership / selectionstrategy / EntityOwnerSelectionStrategyConfigReaderTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/EntityOwnerSelectionStrategyConfigReaderTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/EntityOwnerSelectionStrategyConfigReaderTest.java
index feced489a219bd7eac13f37dcd5c0d1d94c1254f..5302283a15439600616deb2c15383a42e3d86fd6 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/EntityOwnerSelectionStrategyConfigReaderTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/EntityOwnerSelectionStrategyConfigReaderTest.java
@@ -37,9 +37,6 @@ public class EntityOwnerSelectionStrategyConfigReaderTest {
         doReturn(mockConfigAdmin).when(mockBundleContext).getService(mockConfigAdminServiceRef);
 
         doReturn(mockConfig).when(mockConfigAdmin).getConfiguration(EntityOwnerSelectionStrategyConfigReader.CONFIG_ID);
-
-
-
     }
 
     @Test
@@ -59,7 +56,7 @@ public class EntityOwnerSelectionStrategyConfigReaderTest {
     }
 
     @Test
-    public void testReadStrategiesForNonExistentFile() throws IOException {
+    public void testReadStrategiesWithIOException() throws IOException {
         doThrow(IOException.class).when(mockConfigAdmin).getConfiguration(EntityOwnerSelectionStrategyConfigReader.CONFIG_ID);
 
         EntityOwnerSelectionStrategyConfig config = new EntityOwnerSelectionStrategyConfigReader(mockBundleContext).getConfig();
@@ -67,6 +64,24 @@ public class EntityOwnerSelectionStrategyConfigReaderTest {
         assertFalse(config.isStrategyConfigured("test"));
     }
 
+    @Test
+    public void testReadStrategiesWithNullConfiguration() throws IOException {
+        doReturn(null).when(mockConfigAdmin).getConfiguration(EntityOwnerSelectionStrategyConfigReader.CONFIG_ID);
+
+        EntityOwnerSelectionStrategyConfig config = new EntityOwnerSelectionStrategyConfigReader(mockBundleContext).getConfig();
+
+        assertFalse(config.isStrategyConfigured("test"));
+    }
+
+    @Test
+    public void testReadStrategiesWithNullConfigurationProperties() throws IOException {
+        doReturn(null).when(mockConfig).getProperties();
+
+        EntityOwnerSelectionStrategyConfig config = new EntityOwnerSelectionStrategyConfigReader(mockBundleContext).getConfig();
+
+        assertFalse(config.isStrategyConfigured("test"));
+    }
+
     @Test
     public void testReadStrategiesInvalidDelay(){
         Hashtable<String, Object> props = new Hashtable<>();