X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Fimpl%2FServicehandlerProviderTest.java;h=99e6c399e5c83c1d64b9b01e3801fc4e86719eb3;hb=27070ce7114dcdb1da7203c54724fa3fe59e7cc3;hp=85b51d7cbf842a9e2ed1f9332b7498aa6997bbc8;hpb=1c4b0ba3a2ca77a6acfcd41453b7c9c0f2f2480d;p=transportpce.git

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 85b51d7cb..99e6c399e 100644
--- 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,65 +11,47 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import org.junit.After;
-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.mdsal.binding.api.RpcProviderService;
-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.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.TransportpceNetworkmodelListener;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.TransportpcePceListener;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererListener;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.Services;
 
-public class ServicehandlerProviderTest  extends AbstractTest {
+@ExtendWith(MockitoExtension.class)
+public class ServicehandlerProviderTest extends AbstractTest {
 
     @Mock
-    RpcProviderService rpcProviderRegistry;
-
+    DataBroker dataBroker;
     @Mock
     ServiceDataStoreOperations serviceDataStoreOperations;
-
     @Mock
-    PceListenerImpl pceListenerImpl;
-
+    TransportpcePceListener pceListenerImpl;
     @Mock
-    ServiceListener serviceListener;
-
+    TransportpceRendererListener rendererListenerImpl;
     @Mock
-    RendererListenerImpl rendererListenerImpl;
-
+    TransportpceNetworkmodelListener networkModelListenerImpl;
     @Mock
-    NetworkModelListenerImpl networkModelListenerImpl;
-
+    NotificationPublishService notificationPublishService;
     @Mock
-    ServicehandlerImpl servicehandler;
-
-
-    private AutoCloseable closeable;
-
-    @Before
-    public void openMocks() {
-        closeable = MockitoAnnotations.openMocks(this);
-    }
+    OrgOpenroadmServiceService servicehandler;
+    @Mock
+    DataTreeChangeListener<Services> serviceListener;
 
     @Test
-    public void testInitRegisterServiceHandlerToRpcRegistry() {
-        ServicehandlerProvider provider =  new ServicehandlerProvider(
-                getDataBroker(), rpcProviderRegistry,
-                getNotificationService() , serviceDataStoreOperations, pceListenerImpl, serviceListener,
-                rendererListenerImpl, networkModelListenerImpl, servicehandler);
-
-        provider.init();
+    void testInitRegisterServiceHandlerToRpcRegistry() {
+        new ServicehandlerProvider(dataBroker, getNotificationService() ,
+                serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl,
+                notificationPublishService, servicehandler, serviceListener);
 
-        verify(rpcProviderRegistry, times(1))
-                .registerRpcImplementation(any(), any(ServicehandlerImpl.class));
+        verify(dataBroker, times(1)).registerDataTreeChangeListener(any(), any());
     }
-
-    @After public void releaseMocks() throws Exception {
-        closeable.close();
-    }
-
-}
+}
\ No newline at end of file