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=b815d1b5363d8607ea2e0ee91a94d1c89740d434;hb=4d94935b354ae96badf10d8f70dd293a34f8c2d2;hp=878c7633ed23281f0ab0d3d910fd0c3f4446bf59;hpb=3e33c429ca86add1881d7586a2d0c3c60ddac3c7;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 878c7633e..b815d1b53 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
@@ -8,99 +8,68 @@
 package org.opendaylight.transportpce.tapi.provider;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import com.google.common.util.concurrent.Futures;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
+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.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.tapi.impl.TapiProvider;
-import org.opendaylight.transportpce.tapi.listeners.TapiPceListenerImpl;
-import org.opendaylight.transportpce.tapi.listeners.TapiRendererListenerImpl;
-import org.opendaylight.transportpce.tapi.listeners.TapiServiceHandlerListenerImpl;
-import org.opendaylight.transportpce.tapi.topology.TapiNetconfTopologyListener;
-import org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener;
-import org.opendaylight.transportpce.tapi.utils.TapiListener;
-import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TapiCommonService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.TapiConnectivityService;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.notification.rev181210.TapiNotificationListener;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.TapiTopologyService;
 
-public class TapiProviderTest extends AbstractTest {
-    public static NetworkTransactionService networkTransactionService;
+@ExtendWith(MockitoExtension.class)
+public class TapiProviderTest {
 
     @Mock
-    RpcProviderService rpcProviderRegistry;
-
+    private DataBroker dataBroker;
     @Mock
-    OrgOpenroadmServiceService serviceHandler;
-
+    private RpcProviderService rpcProviderRegistry;
     @Mock
-    ServiceDataStoreOperations serviceDataStoreOperations;
-
+    private NotificationService notificationService;
     @Mock
-    TapiListener tapiListener;
-
+    private NotificationPublishService notificationPublishService;
     @Mock
-    TransportpceTapinetworkutilsService tapiNetworkUtils;
-
+    private NetworkTransactionService networkTransactionService;
     @Mock
-    TapiPortMappingListener tapiPortMappingListener;
-
+    private OrgOpenroadmServiceService serviceHandler;
     @Mock
-    TapiNetconfTopologyListener topologyListener;
-
+    private ServiceDataStoreOperations serviceDataStoreOperations;
     @Mock
-    TapiPceListenerImpl pceListenerImpl;
-
+    private TransportpceTapinetworkutilsService tapiNetworkUtils;
     @Mock
-    TapiRendererListenerImpl rendererListenerImpl;
-
+    private TapiNotificationListener tapiNetworkModelListenerImpl;
     @Mock
-    TapiServiceHandlerListenerImpl serviceHandlerListenerImpl;
-
-    private AutoCloseable closeable;
-
-    @Before
-    public void openMocks() {
-        closeable = MockitoAnnotations.openMocks(this);
-    }
-
-    @BeforeClass
-    public static void setUp() {
-        networkTransactionService = new NetworkTransactionImpl(
-            new RequestProcessor(getDataBroker()));
-    }
+    private TapiNetworkModelService tapiNetworkModelServiceImpl;
 
     @Test
-    public void testInitRegisterTapiToRpcRegistry() {
-        TapiProvider provider =  new TapiProvider(getDataBroker(), rpcProviderRegistry, serviceHandler,
-            serviceDataStoreOperations, tapiListener, networkTransactionService, topologyListener,
-            tapiPortMappingListener, tapiNetworkUtils, pceListenerImpl, rendererListenerImpl,
-            serviceHandlerListenerImpl, getNotificationService());
-
-        provider.init();
-
-        verify(rpcProviderRegistry, times(1))
-            .registerRpcImplementation(any(), any(TapiConnectivityService.class));
-        verify(rpcProviderRegistry, times(2))
-            .registerRpcImplementation(any(), any(TapiTopologyService.class));
-        verify(rpcProviderRegistry, times(2))
-            .registerRpcImplementation(any(), any(TapiCommonService.class));
-    }
-
-    @After
-    public void releaseMocks() throws Exception {
-        closeable.close();
+    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, tapiNetworkUtils,
+                tapiNetworkModelListenerImpl, tapiNetworkModelServiceImpl);
+
+        verify(rpcProviderRegistry, times(1)).registerRpcImplementation(any(), any(TapiConnectivityService.class));
+        verify(rpcProviderRegistry, times(2)).registerRpcImplementation(any(), any(TapiTopologyService.class));
+        verify(rpcProviderRegistry, times(2)).registerRpcImplementation(any(), any(TapiCommonService.class));
+        verify(dataBroker, times(4)).registerDataTreeChangeListener(any(), any());
     }
-}
+}
\ No newline at end of file