Move netconf.api.monitoring

[netconf.git] / netconf / mdsal-netconf-monitoring / src / test / java / org / opendaylight / controller / config / yang / netconf / mdsal / monitoring / MonitoringToMdsalWriterTest.java

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 037c0e8bd4ea85c80e58da3768f485111e2b6418..e69c3983138fc2e15b32a00eba4fc5d23afa0670 100644 (file)
--- 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
@@ -15,7 +15,6 @@ import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
 import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture;
 
-import java.util.ArrayList;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,7 +25,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
+import org.opendaylight.netconf.server.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;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.CapabilitiesBuilder;
@@ -35,12 +34,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Sessions;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.SessionBuilder;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class MonitoringToMdsalWriterTest {
-
     private static final InstanceIdentifier<NetconfState> INSTANCE_IDENTIFIER =
             InstanceIdentifier.create(NetconfState.class);
 
@@ -50,13 +49,17 @@ public class MonitoringToMdsalWriterTest {
     private DataBroker dataBroker;
     @Mock
     private WriteTransaction writeTransaction;
+    @Mock
+    private Registration capabilityReg;
+    @Mock
+    private Registration sessionsReg;
 
     private MonitoringToMdsalWriter writer;
 
     @Before
     public void setUp() {
-        doReturn(null).when(monitoring).registerCapabilitiesListener(any());
-        doReturn(null).when(monitoring).registerSessionsListener(any());
+        doReturn(capabilityReg).when(monitoring).registerCapabilitiesListener(any());
+        doReturn(sessionsReg).when(monitoring).registerSessionsListener(any());
 
         doReturn(writeTransaction).when(dataBroker).newWriteOnlyTransaction();
 
@@ -64,14 +67,17 @@ public class MonitoringToMdsalWriterTest {
         doNothing().when(writeTransaction).delete(eq(LogicalDatastoreType.OPERATIONAL), any());
         doReturn(emptyFluentFuture()).when(writeTransaction).commit();
 
-        writer = new MonitoringToMdsalWriter(monitoring, dataBroker);
+        writer = new MonitoringToMdsalWriter(dataBroker, monitoring);
     }
 
     @Test
     public void testClose() throws Exception {
-        writer.start();
+        doNothing().when(capabilityReg).close();
+        doNothing().when(sessionsReg).close();
         writer.close();
-        InOrder inOrder = inOrder(writeTransaction);
+        InOrder inOrder = inOrder(capabilityReg, sessionsReg, writeTransaction);
+        inOrder.verify(sessionsReg).close();
+        inOrder.verify(capabilityReg).close();
         inOrder.verify(writeTransaction).delete(LogicalDatastoreType.OPERATIONAL, INSTANCE_IDENTIFIER);
         inOrder.verify(writeTransaction).commit();
     }
@@ -80,7 +86,6 @@ public class MonitoringToMdsalWriterTest {
     public void testOnCapabilityChanged() throws Exception {
         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);
@@ -92,7 +97,6 @@ public class MonitoringToMdsalWriterTest {
     public void testOnSchemasChanged() throws Exception {
         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);
@@ -109,7 +113,6 @@ public class MonitoringToMdsalWriterTest {
                 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);
@@ -125,7 +128,6 @@ public class MonitoringToMdsalWriterTest {
                 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);
@@ -140,9 +142,6 @@ public class MonitoringToMdsalWriterTest {
         Session session2 = new SessionBuilder()
                 .setSessionId(Uint32.valueOf(2))
                 .build();
-        List<Session> sessions = new ArrayList<>();
-        sessions.add(session1);
-        sessions.add(session2);
         final InstanceIdentifier<Session> id1 =
                 InstanceIdentifier.create(NetconfState.class)
                         .child(Sessions.class)
@@ -151,8 +150,7 @@ public class MonitoringToMdsalWriterTest {
                 InstanceIdentifier.create(NetconfState.class)
                         .child(Sessions.class)
                         .child(Session.class, session2.key());
-        writer.start();
-        writer.onSessionsUpdated(sessions);
+        writer.onSessionsUpdated(List.of(session1, session2));
         InOrder inOrder = inOrder(writeTransaction);
         inOrder.verify(writeTransaction).put(LogicalDatastoreType.OPERATIONAL, id1, session1);
         inOrder.verify(writeTransaction).put(LogicalDatastoreType.OPERATIONAL, id2, session2);
@@ -161,7 +159,6 @@ public class MonitoringToMdsalWriterTest {
 
     @Test
     public void testOnSessionInitiated() throws Exception {
-        writer.start();
         verify(monitoring).registerCapabilitiesListener(writer);
     }
 }
\ No newline at end of file