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=b8fa55473c0555d7418e9d1c5b313dd157b62392;hp=e07f9ce3e18db86d3ab184313df6b0c0c5090f2c;hpb=a92d9d6a21a0f6ca8d2153795721f500eaf29ee9;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 e07f9ce3e1..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 @@ -1,20 +1,19 @@ /* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ +* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. +* +* This program and the accompanying materials are made available under the +* terms of the Eclipse Public License v1.0 which accompanies this distribution, +* and is available at http://www.eclipse.org/legal/epl-v10.html +*/ 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("s1", "module", "instance"); - assertEquals(1, services.getMappedServices().size()); - - services.addServiceEntry("s2", "module", "instance"); - assertEquals(2, services.getMappedServices().size()); - } - - @Test - public void testMultipleInstancesOneName() throws Exception { - Services services = new Services(); - services.addServiceEntry("s1", "module", "instance"); - assertEquals(1, services.getMappedServices().size()); - - services.addServiceEntry("s1", "module2", "instance"); - assertEquals(1, services.getMappedServices().size()); - assertEquals(2, services.getMappedServices().get("s1").size()); - assertTrue(services.getMappedServices().get("s1").containsKey("ref_instance")); - assertTrue(services.getMappedServices().get("s1").containsKey("ref_instance_1")); - } - - @Test - public void testMultipleInstancesOneName2() throws Exception { - Services services = new Services(); - services.addServiceEntry("s1", "module", "instance_1"); - - services.addServiceEntry("s2", "module2", "instance"); - services.addServiceEntry("s2", "module3", "instance"); - services.addServiceEntry("s1", "module3", "instance"); - - assertEquals(2, services.getMappedServices().get("s1").size()); - assertEquals(2, services.getMappedServices().get("s2").size()); - assertTrue(services.getMappedServices().get("s1").containsKey("ref_instance_2")); - assertTrue(services.getMappedServices().get("s1").containsKey("ref_instance_1")); - assertTrue(services.getMappedServices().get("s2").containsKey("ref_instance")); - assertTrue(services.getMappedServices().get("s2").containsKey("ref_instance_2")); - } - }