X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2FServiceTrackerTest.java;h=0d830c247209bd7b3b3ada2dbbab25ea77d748d3;hb=304dec89fd7a13b42e821ca51b08bca93d7dc540;hp=425ecf6d02628962de3b8268d21b119c72370bf2;hpb=e7c8982a45c9ee5789d7ba25bb0324065efbe23e;p=controller.git 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 425ecf6d02..0d830c2472 100644 --- 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 @@ -8,13 +8,12 @@ package org.opendaylight.controller.netconf.confignetconfconnector; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Services; 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 { @Test @@ -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")); - } - }