Move RemoteDeviceId

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / schema / NetconfRemoteSchemaYangSourceProviderTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java
index f43f016bb519ad13e83867a09fa938d5351f2b0b..fec22f958a64104f0aa32aa874011c31920ab24b 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java
@@ -7,42 +7,39 @@
  */
 package org.opendaylight.netconf.sal.connect.netconf.schema;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.FluentFuture;
 import java.net.InetSocketAddress;
-import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.dom.DOMSource;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.mdsal.dom.api.DOMRpcException;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceId;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
-import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.util.xml.UntrustedXML;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableAnyXmlNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class NetconfRemoteSchemaYangSourceProviderTest {
 
     @Mock
@@ -52,11 +49,9 @@ public class NetconfRemoteSchemaYangSourceProviderTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        final DOMRpcResult value = new DefaultDOMRpcResult(getNode(), Collections.emptySet());
-        CheckedFuture<DOMRpcResult, DOMRpcException> response = Futures.immediateCheckedFuture(value);
-        doReturn(response).when(service).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class));
+        final DOMRpcResult value = new DefaultDOMRpcResult(getNode(), Set.of());
+        final FluentFuture<DOMRpcResult> response = FluentFutures.immediateFluentFuture(value);
+        doReturn(response).when(service).invokeRpc(any(QName.class), any(ContainerNode.class));
 
         provider = new NetconfRemoteSchemaYangSourceProvider(
                 new RemoteDeviceId("device1", InetSocketAddress.createUnresolved("localhost", 17830)), service);
@@ -64,17 +59,14 @@ public class NetconfRemoteSchemaYangSourceProviderTest {
 
     @Test
     public void testGetSource() throws Exception {
-        final SourceIdentifier identifier = RevisionSourceIdentifier.create("test", Revision.of("2016-02-08"));
+        final SourceIdentifier identifier = new SourceIdentifier("test", "2016-02-08");
         final YangTextSchemaSource source = provider.getSource(identifier).get();
-        Assert.assertEquals(identifier, source.getIdentifier());
-        verify(service).invokeRpc(
-                SchemaPath.create(true, NetconfMessageTransformUtil.GET_SCHEMA_QNAME),
-                NetconfRemoteSchemaYangSourceProvider.createGetSchemaRequest(identifier.getName(),
-                    identifier.getRevision().map(Revision::toString))
-        );
+        assertEquals(identifier, source.getIdentifier());
+        verify(service).invokeRpc(NetconfMessageTransformUtil.GET_SCHEMA_QNAME,
+                NetconfRemoteSchemaYangSourceProvider.createGetSchemaRequest("test", Optional.of("2016-02-08")));
     }
 
-    private static NormalizedNode<?, ?> getNode() throws ParserConfigurationException {
+    private static ContainerNode getNode() throws ParserConfigurationException {
         final YangInstanceIdentifier.NodeIdentifier id = YangInstanceIdentifier.NodeIdentifier.create(
                 QName.create("urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring", "2010-10-04", "output")
         );
@@ -84,10 +76,12 @@ public class NetconfRemoteSchemaYangSourceProviderTest {
         Document xmlDoc = UntrustedXML.newDocumentBuilder().newDocument();
         Element root = xmlDoc.createElement("data");
         root.setTextContent("module test {}");
-        final DOMSource v = new DOMSource(root);
-        DataContainerChild<?, ?> child =
-                ImmutableAnyXmlNodeBuilder.create().withNodeIdentifier(childId).withValue(v).build();
-        return ImmutableContainerNodeBuilder.create().withNodeIdentifier(id).withChild(child).build();
+        return Builders.containerBuilder()
+            .withNodeIdentifier(id)
+            .withChild(Builders.anyXmlBuilder()
+                .withNodeIdentifier(childId)
+                .withValue(new DOMSource(root))
+                .build())
+            .build();
     }
-
 }