Remove registerDataChangeListener remnants

registerDataChangeListener is being removed - a few UTs were
still calling it unnecessarily.

Change-Id: I6189722edb5e698f5ba58586cf6c399dba04acf2
Signed-off-by: Tom Pantelis <[email protected]>

diff --git a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusInterfaceStateListenerTest.java b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusInterfaceStateListenerTest.java
index 176ed2f09ed43d7f195569135a749644ca93e122..ade37fa3dcb8af01c0f04c34ac424e4d32b56794 100644 (file)
--- a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusInterfaceStateListenerTest.java
+++ b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusInterfaceStateListenerTest.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.sfc.genius.impl.listeners;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
@@ -20,13 +18,10 @@ import java.util.concurrent.ExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.sfc.genius.impl.SfcGeniusServiceManager;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -49,12 +44,6 @@ public class SfcGeniusInterfaceStateListenerTest {
 
     @Before
     public void setup() {
-        when(dataBroker.registerDataChangeListener(
-                        eq(LogicalDatastoreType.OPERATIONAL),
-                        eq(InstanceIdentifier.create(InterfacesState.class).child(Interface.class)),
-                        any(),
-                        any()))
-                .thenAnswer(Answers.RETURNS_DEEP_STUBS.get());
         when(anInterface.getName()).thenReturn("IF1");
         when(anInterface.getLowerLayerIf()).thenReturn(Collections.singletonList("openflow:123456789:3"));
         sfcGeniusInterfaceStateListener = new SfcGeniusInterfaceStateListener(dataBroker, handler, executorService);

diff --git a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfListenerTest.java b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfListenerTest.java
index be3abe4fbb36ccd6cd63dd33e127118a9457fed9..43e8432bd58914ee30f50192e2cbaf3c6e5abdbf 100644 (file)
--- a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfListenerTest.java
+++ b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfListenerTest.java
@@ -8,10 +8,7 @@
 
 package org.opendaylight.sfc.genius.impl.listeners;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import java.util.Collections;
 import java.util.List;
@@ -19,13 +16,10 @@ import java.util.concurrent.ExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.sfc.genius.impl.SfcGeniusServiceManager;
-import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.ServiceFunctions;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocator;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocatorBuilder;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunction;
@@ -57,12 +51,6 @@ public class SfcGeniusSfListenerTest {
         sfDataPlaneLocator = new SfDataPlaneLocatorBuilder().setLocatorType(logicalInterface).build();
         List<SfDataPlaneLocator> sfDataPlaneLocatorList = Collections.singletonList(sfDataPlaneLocator);
         serviceFunction = new ServiceFunctionBuilder().setSfDataPlaneLocator(sfDataPlaneLocatorList).build();
-        when(dataBroker.registerDataChangeListener(
-                        eq(LogicalDatastoreType.CONFIGURATION),
-                        eq(InstanceIdentifier.create(ServiceFunctions.class).child(ServiceFunction.class)),
-                        any(),
-                        any()))
-                .thenAnswer(Answers.RETURNS_DEEP_STUBS.get());
         sfcGeniusSfListener = new SfcGeniusSfListener(dataBroker, sfcGeniusServiceManager, executorService);
     }
 
@@ -71,4 +59,4 @@ public class SfcGeniusSfListenerTest {
         sfcGeniusSfListener.remove(InstanceIdentifier.create(ServiceFunction.class), serviceFunction);
         verify(sfcGeniusServiceManager).unbindInterfaces(Collections.singletonList("IFA"));
     }
-}
\ No newline at end of file
+}

diff --git a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfStateListenerTest.java b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfStateListenerTest.java
index 013d8e8d2115ad5dbfd9f3ca1c9acbd9ad75948d..2087745b287436d605a8bb0db26038172156d4f1 100644 (file)
--- a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfStateListenerTest.java
+++ b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSfStateListenerTest.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.sfc.genius.impl.listeners;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
@@ -19,14 +17,11 @@ import java.util.concurrent.ExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.sfc.genius.impl.SfcGeniusServiceManager;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName;
-import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.ServiceFunctionsState;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.state.ServiceFunctionState;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.state.service.function.state.SfServicePath;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -53,12 +48,6 @@ public class SfcGeniusSfStateListenerTest {
 
     @Before
     public void setup() {
-        when(dataBroker.registerDataChangeListener(
-                    eq(LogicalDatastoreType.OPERATIONAL),
-                    eq(InstanceIdentifier.create(ServiceFunctionsState.class).child(ServiceFunctionState.class)),
-                    any(),
-                    any()))
-                .thenAnswer(Answers.RETURNS_DEEP_STUBS.get());
         sfcGeniusSfStateListener = new SfcGeniusSfStateListener(dataBroker, sfcGeniusServiceManager, executorService);
     }
 

diff --git a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSffDpnStateListenerTest.java b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSffDpnStateListenerTest.java
index 6ed48be8d0589d5294880267b7624a4e349a15e7..10609a041b1efcce65e0a6aa93c21ac5cf0d14fb 100644 (file)
--- a/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSffDpnStateListenerTest.java
+++ b/sfc-genius/src/test/java/org/opendaylight/sfc/genius/impl/listeners/SfcGeniusSffDpnStateListenerTest.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.sfc.genius.impl.listeners;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
@@ -20,17 +18,11 @@ import java.util.concurrent.ExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.sfc.genius.impl.SfcGeniusServiceManager;
-import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.ServiceFunctionForwardersState;
-import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarders.state.ServiceFunctionForwarderState;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.logical.rev160620.DpnIdType;
-import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.logical.rev160620.SffLogicalSffAugmentation;
-import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.logical.rev160620.dpnid.rsps.DpnRsps;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.logical.rev160620.dpnid.rsps.dpn.rsps.Dpn;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.logical.rev160620.dpnid.rsps.dpn.rsps.dpn.RspsForDpnid;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.logical.rev160620.dpnid.rsps.dpn.rsps.dpn.rsps._for.dpnid.Rsps;
@@ -64,16 +56,6 @@ public class SfcGeniusSffDpnStateListenerTest {
         when(dpn.getDpnId()).thenReturn(new DpnIdType(new BigInteger("1")));
         when(dpn.getRspsForDpnid()).thenReturn(rspsForDpnid);
         when(rspsForDpnid.getRsps()).thenReturn(rspsList);
-        when(dataBroker.registerDataChangeListener(
-                eq(LogicalDatastoreType.OPERATIONAL),
-                eq(InstanceIdentifier.create(ServiceFunctionForwardersState.class)
-                        .child(ServiceFunctionForwarderState.class)
-                        .augmentation(SffLogicalSffAugmentation.class)
-                        .child(DpnRsps.class)
-                        .child(Dpn.class)),
-                any(),
-                any()))
-                .thenAnswer(Answers.RETURNS_DEEP_STUBS.get());
         sfcGeniusSffDpnStateListener = new SfcGeniusSffDpnStateListener(
                 dataBroker,
                 sfcGeniusServiceManager,