Catalog RPC Implementation

[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / impl / ServicehandlerProviderTest.java

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
index a503f15d1d196ed3e0889a46876bcb7b1ce1c6c4..d7ed6b725bc28793724eca2706e43a6abb85a968 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
@@ -11,57 +11,49 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService;
-import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.transportpce.servicehandler.catalog.CatalogDataStoreOperations;
+import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.ServiceListener;
+import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.test.AbstractTest;
 
-
+@ExtendWith(MockitoExtension.class)
 public class ServicehandlerProviderTest  extends AbstractTest {
 
     @Mock
-    private PathComputationService pathComputationService;
-
+    RpcProviderService rpcProviderRegistry;
     @Mock
-    private RendererServiceOperations rendererServiceOperations;
-
+    ServiceDataStoreOperations serviceDataStoreOperations;
     @Mock
-    private NotificationPublishService notificationPublishService;
-
+    CatalogDataStoreOperations catalogDataStoreOperations;
     @Mock
-    RpcProviderRegistry rpcProviderRegistry;
-
+    PceListenerImpl pceListenerImpl;
     @Mock
-    NetworkModelWavelengthService networkModelWavelengthService;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
+    ServiceListener serviceListener;
+    @Mock
+    RendererListenerImpl rendererListenerImpl;
+    @Mock
+    NetworkModelListenerImpl networkModelListenerImpl;
+    @Mock
+    ServicehandlerImpl servicehandler;
 
-    }
 
     @Test
-    public void testInitRegisterServiceHandlerToRpcRegistry() {
+    void testInitRegisterServiceHandlerToRpcRegistry() {
         ServicehandlerProvider provider =  new ServicehandlerProvider(
                 getDataBroker(), rpcProviderRegistry,
-                getNotificationService() , pathComputationService,
-                rendererServiceOperations, networkModelWavelengthService,
-                notificationPublishService);
+                getNotificationService() , serviceDataStoreOperations, pceListenerImpl, serviceListener,
+                rendererListenerImpl, networkModelListenerImpl, servicehandler, catalogDataStoreOperations);
 
         provider.init();
 
-        verify(rpcProviderRegistry, times(1))
-                .addRpcImplementation(any(), any(ServicehandlerImpl.class));
+        verify(rpcProviderRegistry, times(1)).registerRpcImplementation(any(), any(ServicehandlerImpl.class));
     }
-
-
-
-
-
-}
+}
\ No newline at end of file