X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fmdsal-netconf-monitoring%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fnetconf%2Fmdsal%2Fmonitoring%2FMonitoringToMdsalWriterTest.java;h=782543db71b314465bcb241cf20938699cc0de47;hb=de76f7996dc99d8580345e20ac4cd6e90330037f;hp=ce52b2508e9e1b68357d630e1010ee714989e857;hpb=990f1c0d249e9f27e192cf6c1300e516ace81087;p=netconf.git

diff --git a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
index ce52b2508e..782543db71 100644
--- a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
+++ b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
@@ -5,19 +5,17 @@
  * 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.controller.config.yang.netconf.mdsal.monitoring;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+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.inOrder;
 import static org.mockito.Mockito.verify;
+import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture;
 
-import com.google.common.util.concurrent.Futures;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
@@ -27,7 +25,6 @@ import org.mockito.MockitoAnnotations;
 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.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities;
@@ -41,13 +38,12 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class MonitoringToMdsalWriterTest {
 
-    private static final InstanceIdentifier<NetconfState> INSTANCE_IDENTIFIER = InstanceIdentifier.create(NetconfState.class);
+    private static final InstanceIdentifier<NetconfState> INSTANCE_IDENTIFIER =
+            InstanceIdentifier.create(NetconfState.class);
 
     @Mock
     private NetconfMonitoringService monitoring;
     @Mock
-    private BindingAwareBroker.ProviderContext context;
-    @Mock
     private DataBroker dataBroker;
     @Mock
     private WriteTransaction writeTransaction;
@@ -61,46 +57,46 @@ public class MonitoringToMdsalWriterTest {
         doReturn(null).when(monitoring).registerCapabilitiesListener(any());
         doReturn(null).when(monitoring).registerSessionsListener(any());
 
-        doReturn(dataBroker).when(context).getSALService(DataBroker.class);
-
         doReturn(writeTransaction).when(dataBroker).newWriteOnlyTransaction();
 
         doNothing().when(writeTransaction).put(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
         doNothing().when(writeTransaction).delete(eq(LogicalDatastoreType.OPERATIONAL), any());
-        doReturn(Futures.immediateCheckedFuture(null)).when(writeTransaction).submit();
+        doReturn(emptyFluentFuture()).when(writeTransaction).commit();
 
-        writer = new MonitoringToMdsalWriter(monitoring);
+        writer = new MonitoringToMdsalWriter(monitoring, dataBroker);
     }
 
     @Test
     public void testClose() throws Exception {
-        writer.onSessionInitiated(context);
+        writer.start();
         writer.close();
         InOrder inOrder = inOrder(writeTransaction);
         inOrder.verify(writeTransaction).delete(LogicalDatastoreType.OPERATIONAL, INSTANCE_IDENTIFIER);
-        inOrder.verify(writeTransaction).submit();
+        inOrder.verify(writeTransaction).commit();
     }
 
     @Test
     public void testOnCapabilityChanged() throws Exception {
-        final InstanceIdentifier<Capabilities> capabilitiesId = InstanceIdentifier.create(NetconfState.class).child(Capabilities.class);
-        writer.onSessionInitiated(context);
+        final InstanceIdentifier<Capabilities> capabilitiesId =
+                InstanceIdentifier.create(NetconfState.class).child(Capabilities.class);
+        writer.start();
         final Capabilities capabilities = new CapabilitiesBuilder().build();
         writer.onCapabilitiesChanged(capabilities);
         InOrder inOrder = inOrder(writeTransaction);
         inOrder.verify(writeTransaction).put(LogicalDatastoreType.OPERATIONAL, capabilitiesId, capabilities);
-        inOrder.verify(writeTransaction).submit();
+        inOrder.verify(writeTransaction).commit();
     }
 
     @Test
     public void testOnSchemasChanged() throws Exception {
-        final InstanceIdentifier<Schemas> schemasId = InstanceIdentifier.create(NetconfState.class).child(Schemas.class);
-        writer.onSessionInitiated(context);
+        final InstanceIdentifier<Schemas> schemasId =
+                InstanceIdentifier.create(NetconfState.class).child(Schemas.class);
+        writer.start();
         final Schemas schemas = new SchemasBuilder().build();
         writer.onSchemasChanged(schemas);
         InOrder inOrder = inOrder(writeTransaction);
         inOrder.verify(writeTransaction).put(LogicalDatastoreType.OPERATIONAL, schemasId, schemas);
-        inOrder.verify(writeTransaction).submit();
+        inOrder.verify(writeTransaction).commit();
     }
 
     @Test
@@ -108,12 +104,15 @@ public class MonitoringToMdsalWriterTest {
         Session session = new SessionBuilder()
                 .setSessionId(1L)
                 .build();
-        final InstanceIdentifier<Session> id = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session.getKey());
-        writer.onSessionInitiated(context);
+        final InstanceIdentifier<Session> id =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session.key());
+        writer.start();
         writer.onSessionStarted(session);
         InOrder inOrder = inOrder(writeTransaction);
         inOrder.verify(writeTransaction).put(LogicalDatastoreType.OPERATIONAL, id, session);
-        inOrder.verify(writeTransaction).submit();
+        inOrder.verify(writeTransaction).commit();
     }
 
     @Test
@@ -121,12 +120,15 @@ public class MonitoringToMdsalWriterTest {
         Session session = new SessionBuilder()
                 .setSessionId(1L)
                 .build();
-        final InstanceIdentifier<Session> id = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session.getKey());
-        writer.onSessionInitiated(context);
+        final InstanceIdentifier<Session> id =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session.key());
+        writer.start();
         writer.onSessionEnded(session);
         InOrder inOrder = inOrder(writeTransaction);
         inOrder.verify(writeTransaction).delete(LogicalDatastoreType.OPERATIONAL, id);
-        inOrder.verify(writeTransaction).submit();
+        inOrder.verify(writeTransaction).commit();
     }
 
     @Test
@@ -140,19 +142,25 @@ public class MonitoringToMdsalWriterTest {
         List<Session> sessions = new ArrayList<>();
         sessions.add(session1);
         sessions.add(session2);
-        final InstanceIdentifier<Session> id1 = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session1.getKey());
-        final InstanceIdentifier<Session> id2 = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session2.getKey());
-        writer.onSessionInitiated(context);
+        final InstanceIdentifier<Session> id1 =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session1.key());
+        final InstanceIdentifier<Session> id2 =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session2.key());
+        writer.start();
         writer.onSessionsUpdated(sessions);
         InOrder inOrder = inOrder(writeTransaction);
         inOrder.verify(writeTransaction).put(LogicalDatastoreType.OPERATIONAL, id1, session1);
         inOrder.verify(writeTransaction).put(LogicalDatastoreType.OPERATIONAL, id2, session2);
-        inOrder.verify(writeTransaction).submit();
+        inOrder.verify(writeTransaction).commit();
     }
 
     @Test
     public void testOnSessionInitiated() throws Exception {
-        writer.onSessionInitiated(context);
+        writer.start();
         verify(monitoring).registerCapabilitiesListener(writer);
     }
 }
\ No newline at end of file