X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Fprovider%2FTapiProviderTest.java;h=535ba90b393b6e94b892373f176af6115d645d8e;hb=198afc243c98aedfc5b30b93c1a5e3052d30868c;hp=8efd0441021c50a5f683f7737823d0ac4050355b;hpb=37a539ad2c5ad1006cd0203de63d80350c32b72e;p=transportpce.git

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
index 8efd04410..535ba90b3 100644
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
@@ -14,6 +14,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture;
 
+import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.util.concurrent.Futures;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -24,12 +25,12 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.binding.api.RpcService;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.tapi.impl.TapiProvider;
+import org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelNotificationHandler;
 import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService;
-import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.notification.rev181210.TapiNotificationListener;
 
 @ExtendWith(MockitoExtension.class)
 public class TapiProviderTest {
@@ -37,19 +38,19 @@ public class TapiProviderTest {
     @Mock
     private DataBroker dataBroker;
     @Mock
-    private RpcProviderService rpcProviderRegistry;
+    private RpcProviderService rpcProviderService;
     @Mock
     private NotificationService notificationService;
     @Mock
+    private RpcService rpcService;
+    @Mock
     private NotificationPublishService notificationPublishService;
     @Mock
     private NetworkTransactionService networkTransactionService;
     @Mock
-    private OrgOpenroadmServiceService serviceHandler;
-    @Mock
     private ServiceDataStoreOperations serviceDataStoreOperations;
     @Mock
-    private TapiNotificationListener tapiNetworkModelListenerImpl;
+    private TapiNetworkModelNotificationHandler tapiNetworkModelNotificationHandler;
     @Mock
     private TapiNetworkModelService tapiNetworkModelServiceImpl;
 
@@ -57,11 +58,11 @@ public class TapiProviderTest {
     void testInitRegisterTapiToRpcRegistry() {
         when(networkTransactionService.read(any(), any())).thenReturn(Futures.immediateFuture(Optional.empty()));
         doReturn(emptyFluentFuture()).when(networkTransactionService).commit();
-        new TapiProvider(dataBroker, rpcProviderRegistry, notificationService, notificationPublishService,
-                networkTransactionService, serviceHandler, serviceDataStoreOperations,
-                tapiNetworkModelListenerImpl, tapiNetworkModelServiceImpl);
+        new TapiProvider(dataBroker, rpcProviderService, rpcService, notificationService, notificationPublishService,
+                networkTransactionService, serviceDataStoreOperations,
+                tapiNetworkModelNotificationHandler, tapiNetworkModelServiceImpl);
 
-        verify(rpcProviderRegistry, times(2)).registerRpcImplementations(any());
-        verify(dataBroker, times(4)).registerDataTreeChangeListener(any(), any());
+        verify(rpcProviderService, times(2)).registerRpcImplementations(any(ClassToInstanceMap.class));
+        verify(dataBroker, times(4)).registerTreeChangeListener(any(), any());
     }
-}
\ No newline at end of file
+}