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=9bafd9948d954950680ae5ba7d936f9fd5eee092;hb=46b020d25342f0ca86d83f6a503d7565f67f829e;hp=9427914c4aca2a6b2758ebde1968cf1384c37327;hpb=5e89fe2242ea395f6aee61b1f060c7b6183aeb27;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 9427914c4..9bafd9948 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,34 +8,34 @@
 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.jupiter.api.BeforeAll;
+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.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.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.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService;
-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;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService;
 
 @ExtendWith(MockitoExtension.class)
-public class TapiProviderTest extends AbstractTest {
-    private static NetworkTransactionService networkTransactionService;
+public class TapiProviderTest {
 
+    @Mock
+    private DataBroker dataBroker;
     @Mock
     private RpcProviderService rpcProviderRegistry;
     @Mock
@@ -43,29 +43,25 @@ public class TapiProviderTest extends AbstractTest {
     @Mock
     private NotificationPublishService notificationPublishService;
     @Mock
+    private NetworkTransactionService networkTransactionService;
+    @Mock
     private OrgOpenroadmServiceService serviceHandler;
     @Mock
     private ServiceDataStoreOperations serviceDataStoreOperations;
     @Mock
-    private TransportpceTapinetworkutilsService tapiNetworkUtils;
-    @Mock
-    private TapiNotificationListener tapiNetworkModelListenerImpl;
+    private TapiNetworkModelNotificationHandler tapiNetworkModelNotificationHandler;
     @Mock
     private TapiNetworkModelService tapiNetworkModelServiceImpl;
 
-    @BeforeAll
-    static void setUp() {
-        networkTransactionService = new NetworkTransactionImpl(getDataBroker());
-    }
-
     @Test
     void testInitRegisterTapiToRpcRegistry() {
-        TapiProvider provider =  new TapiProvider(getDataBroker(), rpcProviderRegistry, notificationService,
-            notificationPublishService, networkTransactionService, serviceHandler, serviceDataStoreOperations,
-            tapiNetworkUtils, tapiNetworkModelListenerImpl, tapiNetworkModelServiceImpl);
+        when(networkTransactionService.read(any(), any())).thenReturn(Futures.immediateFuture(Optional.empty()));
+        doReturn(emptyFluentFuture()).when(networkTransactionService).commit();
+        new TapiProvider(dataBroker, rpcProviderRegistry, notificationService, notificationPublishService,
+                networkTransactionService, serviceHandler, serviceDataStoreOperations,
+                tapiNetworkModelNotificationHandler, 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(rpcProviderRegistry, times(2)).registerRpcImplementations(any());
+        verify(dataBroker, times(4)).registerDataTreeChangeListener(any(), any());
     }
-}
\ No newline at end of file
+}