Convert ListenerRegistrationHelper into a component

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

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
index 092c234a10a6068c06ef69f5f42209da5c075659..d556f7f6b7aba2347f373f7b676e6bf315dcaa5c 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
+++ b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
@@ -25,7 +25,7 @@ import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationS
 import org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager;
 import org.opendaylight.openflowplugin.applications.frm.impl.DeviceMastershipManager;
 import org.opendaylight.openflowplugin.applications.frm.impl.ForwardingRulesManagerImpl;
-import org.opendaylight.openflowplugin.applications.frm.impl.ListenerRegistrationHelper;
+import org.opendaylight.openflowplugin.applications.frm.impl.ListenerRegistrationHelperImpl;
 import org.opendaylight.openflowplugin.applications.frm.recovery.OpenflowServiceRecoveryHandler;
 import org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager;
 import org.opendaylight.serviceutils.srm.ServiceRecoveryRegistry;
@@ -83,10 +83,11 @@ public abstract class AbstractFRMTest extends AbstractDataBrokerTest {
         when(rpcConsumerRegistry.getRpcService(ArbitratorReconcileService.class))
                 .thenReturn(new ArbitratorReconcileServiceMock());
 
+        final var dataBroker = getDataBroker();
         forwardingRulesManager = new ForwardingRulesManagerImpl(getDataBroker(), rpcConsumerRegistry,
                 rpcProviderService, getConfig(), mastershipChangeServiceManager, clusterSingletonService,
                 getConfigurationService(), reconciliationManager, openflowServiceRecoveryHandler,
-                serviceRecoveryRegistry, flowGroupCacheManager, getRegistrationHelper());
+                serviceRecoveryRegistry, flowGroupCacheManager, new ListenerRegistrationHelperImpl(dataBroker));
         forwardingRulesManager.start();
     }
 
@@ -147,8 +148,4 @@ public abstract class AbstractFRMTest extends AbstractDataBrokerTest {
 
         return configurationService;
     }
-
-    private ListenerRegistrationHelper getRegistrationHelper() {
-        return new ListenerRegistrationHelper(getDataBroker());
-    }
 }