Merge "Fix for Bug 3"

[controller.git] / opendaylight / netconf / config-netconf-connector / src / test / java / org / opendaylight / controller / netconf / confignetconfconnector / ServiceTrackerTest.java

diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/ServiceTrackerTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/ServiceTrackerTest.java
index 425ecf6d02628962de3b8268d21b119c72370bf2..d5ba976ccfd1feabbf5ec97412b09e9f0ce1f8f9 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/ServiceTrackerTest.java
+++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/ServiceTrackerTest.java
@@ -13,7 +13,6 @@ import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Services.ServiceInstance;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class ServiceTrackerTest {
 
@@ -28,44 +27,4 @@ public class ServiceTrackerTest {
         assertEquals(serviceInstance, serviceInstance2);
     }
 
-    @Test
-    public void testOneInstanceMultipleServices() {
-        Services services = new Services();
-        services.addServiceEntry("nm", "s1", "module", "instance");
-        assertEquals(1, services.getMappedServices().size());
-
-        services.addServiceEntry("nm2", "s2", "module", "instance");
-        assertEquals(2, services.getMappedServices().size());
-    }
-
-    @Test
-    public void testMultipleInstancesOneName() throws Exception {
-        Services services = new Services();
-        services.addServiceEntry("nm", "s1", "module", "instance");
-        assertEquals(1, services.getMappedServices().size());
-
-        services.addServiceEntry("nm", "s1", "module2", "instance");
-        assertEquals(1, services.getMappedServices().size());
-        assertEquals(2, services.getMappedServices().get("nm").get("s1").size());
-        assertTrue(services.getMappedServices().get("nm").get("s1").containsKey("ref_instance"));
-        assertTrue(services.getMappedServices().get("nm").get("s1").containsKey("ref_instance_1"));
-    }
-
-    @Test
-    public void testMultipleInstancesOneName2() throws Exception {
-        Services services = new Services();
-        services.addServiceEntry("nm", "s1", "module", "instance_1");
-
-        services.addServiceEntry("nm2", "s2", "module2", "instance");
-        services.addServiceEntry("nm2", "s2", "module3", "instance");
-        services.addServiceEntry("nm", "s1", "module3", "instance");
-
-        assertEquals(2, services.getMappedServices().get("nm").get("s1").size());
-        assertEquals(2, services.getMappedServices().get("nm2").get("s2").size());
-        assertTrue(services.getMappedServices().get("nm").get("s1").containsKey("ref_instance_2"));
-        assertTrue(services.getMappedServices().get("nm").get("s1").containsKey("ref_instance_1"));
-        assertTrue(services.getMappedServices().get("nm2").get("s2").containsKey("ref_instance"));
-        assertTrue(services.getMappedServices().get("nm2").get("s2").containsKey("ref_instance_2"));
-    }
-
 }