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=93cb1686b06c3ac3d48bfb4b082b018aba9d8b30;hb=b1b3bafd549bb501937cea5c976d5344608b6ed3;hp=9bafd9948d954950680ae5ba7d936f9fd5eee092;hpb=49ce2e7166b83268dd637ada6ba5421cd08cf2a1;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 9bafd9948..93cb1686b 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 @@ -24,12 +24,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; @ExtendWith(MockitoExtension.class) public class TapiProviderTest { @@ -37,16 +37,16 @@ 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 TapiNetworkModelNotificationHandler tapiNetworkModelNotificationHandler; @@ -57,11 +57,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, + 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()); + verify(dataBroker, times(4)).registerTreeChangeListener(any(), any()); } }