Merge "Bug 4957 Clean unnecessary code"

[openflowplugin.git] / applications / forwardingrules-manager / src / test / java / test / mock / MeterListenerTest.java

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/MeterListenerTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/MeterListenerTest.java
index 1acc15c2dcef69cae71f377b5070c90d4d58ec8f..457c5dd3c96c019dadc6bc647ece3443cb379e32 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/MeterListenerTest.java
+++ b/applications/forwardingrules-manager/src/test/java/test/mock/MeterListenerTest.java
@@ -9,6 +9,7 @@ package test.mock;
 
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.openflowplugin.applications.frm.impl.ForwardingRulesManagerImpl;
@@ -24,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.Upd
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+import test.mock.util.EntityOwnershipServiceMock;
 import test.mock.util.FRMTest;
 import test.mock.util.RpcProviderRegistryMock;
 import test.mock.util.SalMeterServiceMock;
@@ -34,6 +36,8 @@ import static org.junit.Assert.assertEquals;
 
 public class MeterListenerTest extends FRMTest {
     RpcProviderRegistry rpcProviderRegistryMock = new RpcProviderRegistryMock();
+    EntityOwnershipService eos = new EntityOwnershipServiceMock();
+
     NodeKey s1Key = new NodeKey(new NodeId("S1"));
 
     @Test
@@ -41,7 +45,7 @@ public class MeterListenerTest extends FRMTest {
         ForwardingRulesManagerImpl forwardingRulesManager = new ForwardingRulesManagerImpl(
                 getDataBroker(),
                 rpcProviderRegistryMock,
-                getConfig());
+                getConfig(), eos);
         forwardingRulesManager.start();
 
         addFlowCapableNode(s1Key);
@@ -80,7 +84,7 @@ public class MeterListenerTest extends FRMTest {
         ForwardingRulesManagerImpl forwardingRulesManager = new ForwardingRulesManagerImpl(
                 getDataBroker(),
                 rpcProviderRegistryMock,
-                getConfig());
+                getConfig(), eos);
         forwardingRulesManager.start();
 
         addFlowCapableNode(s1Key);
@@ -116,7 +120,7 @@ public class MeterListenerTest extends FRMTest {
         ForwardingRulesManagerImpl forwardingRulesManager = new ForwardingRulesManagerImpl(
                 getDataBroker(),
                 rpcProviderRegistryMock,
-                getConfig());
+                getConfig(), eos);
         forwardingRulesManager.start();
 
         addFlowCapableNode(s1Key);