Bump MRI upstreams

[netconf.git] / restconf / restconf-nb-rfc8040 / src / test / java / org / opendaylight / restconf / nb / rfc8040 / rests / services / impl / RestconfOperationsServiceTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java
index a80053290e59b203d8bd2047624ebbfe5c81fe1c..31f1638d9c7f87c290923aaacbc61f99cc1a424b 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableSet;
-import java.net.URI;
 import java.util.Set;
 import javax.ws.rs.core.UriInfo;
 import org.junit.Before;
@@ -27,7 +26,7 @@ import org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
@@ -52,8 +51,8 @@ public class RestconfOperationsServiceTest {
         this.schemaContext = YangParserTestUtils.parseYangFiles(TestRestconfUtils.loadFiles("/modules"));
         this.schemaContextHandler = TestUtils.newSchemaContextHandler(schemaContext);
 
-        final QNameModule module1 = QNameModule.create(URI.create("module:1"));
-        final QNameModule module2 = QNameModule.create(URI.create("module:2"));
+        final QNameModule module1 = QNameModule.create(XMLNamespace.of("module:1"));
+        final QNameModule module2 = QNameModule.create(XMLNamespace.of("module:2"));
 
         this.listOfRpcsNames = ImmutableSet.of(QName.create(module1, "dummy-rpc1-module1"),
                 QName.create(module1, "dummy-rpc2-module1"), QName.create(module2, "dummy-rpc1-module2"),
@@ -66,15 +65,16 @@ public class RestconfOperationsServiceTest {
                 new RestconfOperationsServiceImpl(this.schemaContextHandler, this.domMountPointService);
         final NormalizedNodeContext operations = oper.getOperations(this.uriInfo);
         final ContainerNode data = (ContainerNode) operations.getData();
-        assertEquals("urn:ietf:params:xml:ns:yang:ietf-restconf", data.getNodeType().getNamespace().toString());
-        assertEquals("operations", data.getNodeType().getLocalName());
+        assertEquals("urn:ietf:params:xml:ns:yang:ietf-restconf",
+            data.getIdentifier().getNodeType().getNamespace().toString());
+        assertEquals("operations", data.getIdentifier().getNodeType().getLocalName());
 
-        assertEquals(4, data.getValue().size());
+        assertEquals(4, data.body().size());
 
-        for (final DataContainerChild<? extends PathArgument, ?> child : data.getValue()) {
-            assertEquals(Empty.getInstance(), child.getValue());
+        for (final DataContainerChild child : data.body()) {
+            assertEquals(Empty.getInstance(), child.body());
 
-            final QName qname = child.getNodeType().withoutRevision();
+            final QName qname = child.getIdentifier().getNodeType().withoutRevision();
             assertTrue(this.listOfRpcsNames.contains(qname));
         }
     }