X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fsal%2FNetconfDeviceSalProviderTest.java;h=6cadc6fa26660a1849cc7c9d2639834d3574c266;hb=de76f7996dc99d8580345e20ac4cd6e90330037f;hp=b49b3fd3fbe93091133a8db3ced5b983479059ba;hpb=6c7dc98ecbf088276bdff9b9fadb0e1236711f8a;p=netconf.git

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
index b49b3fd3fb..6cadc6fa26 100644
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
@@ -5,17 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.sal.connect.netconf.sal;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+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 com.google.common.util.concurrent.Futures;
 import java.net.InetSocketAddress;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -24,58 +25,45 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 
 public class NetconfDeviceSalProviderTest {
 
-    @Mock
-    private Broker.ProviderSession session;
     @Mock
     private DOMMountPointService mountpointService;
     @Mock
-    private BindingAwareBroker.ProviderContext context;
-    @Mock
     private WriteTransaction tx;
     @Mock
     private DataBroker dataBroker;
     @Mock
     private BindingTransactionChain chain;
+    @Mock
+    private DOMMountPointService mountPointService;
+    @Mock
+    private WriteTransaction writeTx;
+
     private NetconfDeviceSalProvider provider;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        provider = new NetconfDeviceSalProvider(new RemoteDeviceId("device1", InetSocketAddress.createUnresolved("localhost", 17830)));
-        when(session.getService(DOMMountPointService.class)).thenReturn(mountpointService);
-        when(context.getSALService(DataBroker.class)).thenReturn(dataBroker);
-        when(dataBroker.createTransactionChain(any())).thenReturn(chain);
+        doReturn(chain).when(dataBroker).createTransactionChain(any(TransactionChainListener.class));
+        doReturn(writeTx).when(chain).newWriteOnlyTransaction();
+        doNothing().when(writeTx).merge(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
+        doReturn("Some object").when(writeTx).getIdentifier();
+        doReturn(emptyFluentFuture()).when(writeTx).commit();
+        provider = new NetconfDeviceSalProvider(new RemoteDeviceId("device1",
+                InetSocketAddress.createUnresolved("localhost", 17830)), mountPointService, dataBroker);
         when(chain.newWriteOnlyTransaction()).thenReturn(tx);
-        when(tx.submit()).thenReturn(Futures.immediateCheckedFuture(null));
+        doReturn(emptyFluentFuture()).when(tx).commit();
         when(tx.getIdentifier()).thenReturn(tx);
     }
 
-    @Test
-    public void onSessionInitiated() throws Exception {
-        provider.onSessionInitiated(session);
-        provider.onSessionInitiated(context);
-        Assert.assertNotNull(provider.getMountInstance());
-        Assert.assertNotNull(provider.getTopologyDatastoreAdapter());
-    }
-
-    @Test
-    public void getProviderFunctionality() throws Exception {
-        Assert.assertTrue(provider.getProviderFunctionality().isEmpty());
-    }
-
     @Test
     public void replaceChainIfFailed() throws Exception {
-        provider.onSessionInitiated(session);
-        provider.onSessionInitiated(context);
-        Assert.assertNotNull(provider.getMountInstance());
         final ArgumentCaptor<TransactionChainListener> captor = ArgumentCaptor.forClass(TransactionChainListener.class);
         verify(dataBroker).createTransactionChain(captor.capture());
         try {
@@ -88,18 +76,14 @@ public class NetconfDeviceSalProviderTest {
 
     @Test
     public void close() throws Exception {
-        provider.onSessionInitiated(session);
-        provider.onSessionInitiated(context);
         provider.close();
         verify(chain).close();
     }
 
     @Test
     public void closeWithoutNPE() throws Exception {
-        provider.onSessionInitiated(session);
-        provider.onSessionInitiated(context);
         provider.close();
         provider.close();
         verify(chain, times(2)).close();
     }
-}
\ No newline at end of file
+}