Improve segmented journal actor metrics

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / test / java / org / opendaylight / controller / remote / rpc / OpsRegistrarTest.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java
index 59db730d0152be3289361960bd3da96a98e1ccc8..2dd529f741d33d98949e90a070448a9b659dea73 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java
@@ -38,12 +38,12 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMActionInstance;
 import org.opendaylight.mdsal.dom.api.DOMActionProviderService;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
-import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
 import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
 public class OpsRegistrarTest {
     @Mock
@@ -51,9 +51,9 @@ public class OpsRegistrarTest {
     @Mock
     private DOMActionProviderService actionService;
     @Mock
-    private DOMRpcImplementationRegistration<RemoteRpcImplementation> oldReg;
+    private Registration oldReg;
     @Mock
-    private DOMRpcImplementationRegistration<RemoteRpcImplementation> newReg;
+    private Registration newReg;
     @Mock
     private ObjectRegistration<RemoteActionImplementation> oldActionReg;
     @Mock
@@ -79,19 +79,15 @@ public class OpsRegistrarTest {
         testActorRef = new TestActorRef<>(system, props, testKit.getRef(), "actorRef");
         endpointAddress = new Address("http", "local");
 
-        final DOMRpcIdentifier firstEndpointId = DOMRpcIdentifier.create(
-                SchemaPath.create(true, QName.create("first:identifier", "foo")));
-        final DOMRpcIdentifier secondEndpointId = DOMRpcIdentifier.create(
-                SchemaPath.create(true, QName.create("second:identifier", "bar")));
+        final DOMRpcIdentifier firstEndpointId = DOMRpcIdentifier.create(QName.create("first:identifier", "foo"));
+        final DOMRpcIdentifier secondEndpointId = DOMRpcIdentifier.create(QName.create("second:identifier", "bar"));
         final QName firstActionQName = QName.create("first:actionIdentifier", "fooAction");
 
-        final DOMActionInstance firstActionInstance = DOMActionInstance.of(
-                SchemaPath.create(true, firstActionQName), LogicalDatastoreType.OPERATIONAL,
-                YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(firstActionQName)));
+        final DOMActionInstance firstActionInstance = DOMActionInstance.of(Absolute.of(firstActionQName),
+                LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(firstActionQName));
 
-        final DOMActionInstance secondActionInstance = DOMActionInstance.of(
-                SchemaPath.create(true, firstActionQName), LogicalDatastoreType.OPERATIONAL,
-                YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(firstActionQName)));
+        final DOMActionInstance secondActionInstance = DOMActionInstance.of(Absolute.of(firstActionQName),
+                LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(firstActionQName));
 
         final TestKit senderKit = new TestKit(system);
         firstEndpoint = new RemoteRpcEndpoint(senderKit.getRef(), Collections.singletonList(firstEndpointId));
@@ -154,6 +150,8 @@ public class OpsRegistrarTest {
         inOrder.verify(rpcService).registerRpcImplementation(any(RemoteRpcImplementation.class),
                 eq(secondEndpoint.getRpcs()));
 
+        // verify first registration is closed
+        inOrder.verify(oldReg).close();
 
         verifyNoMoreInteractions(rpcService, oldReg, newReg);
     }
@@ -175,7 +173,7 @@ public class OpsRegistrarTest {
                 eq(secondActionEndpoint.getActions()));
 
         // verify first registration is closed
-//        inOrder.verify(oldReg).close();
+        inOrder.verify(oldActionReg).close();
 
         verifyNoMoreInteractions(actionService, oldActionReg, newActionReg);
     }