Remove networkmodel-blueprint.xml

[transportpce.git] / networkmodel / src / test / java / org / opendaylight / transportpce / networkmodel / NetworkModelProviderTest.java

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
index 5f31c3bdcf4487ca2795379297602019e24b7805..451e63ba55b4666d4bbd34835faa4d00f6339b37 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
@@ -22,9 +22,11 @@ import org.mockito.stubbing.Answer;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
+import org.opendaylight.transportpce.common.mapping.PortMapping;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener;
 import org.opendaylight.transportpce.networkmodel.service.FrequenciesService;
+import org.opendaylight.transportpce.networkmodel.service.NetworkModelService;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.TransportpceNetworkutilsService;
 
@@ -35,22 +37,21 @@ public class NetworkModelProviderTest extends AbstractTest {
     @Mock
     RpcProviderService rpcProviderService;
     @Mock
-    TransportpceNetworkutilsService networkutilsService;
+    NetworkModelService networkModelService;
     @Mock
-    NetConfTopologyListener topologyListener;
+    DeviceTransactionManager deviceTransactionManager;
+    @Mock
+    PortMapping portMapping;
     @Mock
-    private NotificationService notificationService;
+    NetConfTopologyListener topologyListener;
     @Mock
-    private FrequenciesService frequenciesService;
+    NotificationService notificationService;
     @Mock
-    private PortMappingListener portMappingListener;
+    FrequenciesService frequenciesService;
 
 
     @Test
     void networkmodelProviderInitTest() {
-        NetworkModelProvider provider = new NetworkModelProvider(networkTransactionService, getDataBroker(),
-            rpcProviderService, networkutilsService, topologyListener, notificationService,
-            frequenciesService, portMappingListener);
         Answer<FluentFuture<CommitInfo>> answer = new Answer<FluentFuture<CommitInfo>>() {
 
             @Override
@@ -61,7 +62,9 @@ public class NetworkModelProviderTest extends AbstractTest {
         };
         when(networkTransactionService.commit()).then(answer);
 
-        provider.init();
+        new NetworkModelProvider(networkTransactionService, getDataBroker(),
+            rpcProviderService, networkModelService, deviceTransactionManager, portMapping, notificationService,
+            frequenciesService);
 
         verify(rpcProviderService, times(1))
             .registerRpcImplementation(any(), any(TransportpceNetworkutilsService.class));