X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-bierman02%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2Ftest%2Fproviders%2FTestXmlBodyReader.java;h=79f6a510852a5872366b2385b881915fe6b8a5c2;hb=4f8fe6ca68115fecdb9ce43573af5a2e26c50b50;hp=a34308160e2a6470d9ca02518da12e01dfeac9af;hpb=45cfee1861924b4a8086d38079ce8cbd320386d6;p=netconf.git diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java index a34308160e..79f6a51085 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java @@ -5,7 +5,6 @@ * 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.sal.rest.impl.test.providers; import static org.junit.Assert.assertEquals; @@ -16,8 +15,8 @@ import static org.junit.Assert.fail; import com.google.common.collect.Sets; import java.io.File; import java.io.InputStream; -import java.net.URI; import java.util.Collection; +import java.util.Optional; import javax.ws.rs.core.MediaType; import org.junit.Assert; import org.junit.BeforeClass; @@ -30,27 +29,29 @@ import org.opendaylight.restconf.common.errors.RestconfError; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class TestXmlBodyReader extends AbstractBodyReaderTest { private final XmlNormalizedNodeBodyReader xmlBodyReader; - private static SchemaContext schemaContext; + private static EffectiveModelContext schemaContext; private static final QNameModule INSTANCE_IDENTIFIER_MODULE_QNAME = QNameModule.create( - URI.create("instance:identifier:module"), Revision.of("2014-01-17")); + XMLNamespace.of("instance:identifier:module"), Revision.of("2014-01-17")); - public TestXmlBodyReader() throws Exception { - this.xmlBodyReader = new XmlNormalizedNodeBodyReader(); + public TestXmlBodyReader() { + super(schemaContext, null); + this.xmlBodyReader = new XmlNormalizedNodeBodyReader(controllerContext); } @Override @@ -64,7 +65,6 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { testFiles.addAll(TestRestconfUtils.loadFiles("/invoke-rpc")); testFiles.addAll(TestRestconfUtils.loadFiles("/foo-xml-test/yang")); schemaContext = YangParserTestUtils.parseYangFiles(testFiles); - CONTROLLER_CONTEXT.setSchemas(schemaContext); } @Test @@ -85,15 +85,15 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { assertTrue(nnc.getData() instanceof MapEntryNode); final MapEntryNode data = (MapEntryNode) nnc.getData(); - assertTrue(data.getValue().size() == 2); - for (final DataContainerChild child : data.getValue()) { - switch (child.getNodeType().getLocalName()) { + assertEquals(2, data.size()); + for (final DataContainerChild child : data.body()) { + switch (child.getIdentifier().getNodeType().getLocalName()) { case "key-leaf": - assertEquals("key-value", child.getValue()); + assertEquals("key-value", child.body()); break; case "ordinary-leaf": - assertEquals("leaf-value", child.getValue()); + assertEquals("leaf-value", child.body()); break; default: fail(); @@ -153,7 +153,7 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { public void moduleSubContainerAugmentDataPostTest() throws Exception { final DataSchemaNode dataSchemaNode = schemaContext.getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont")); - final Module augmentModule = schemaContext.findModules(new URI("augment:module")).iterator().next(); + final Module augmentModule = schemaContext.findModules(XMLNamespace.of("augment:module")).iterator().next(); final QName contAugmentQName = QName.create(augmentModule.getQNameModule(), "cont-augment"); final YangInstanceIdentifier.AugmentationIdentifier augII = new YangInstanceIdentifier.AugmentationIdentifier( Sets.newHashSet(contAugmentQName)); @@ -173,7 +173,7 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { public void moduleSubContainerChoiceAugmentDataPostTest() throws Exception { final DataSchemaNode dataSchemaNode = schemaContext.getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont")); - final Module augmentModule = schemaContext.findModules(new URI("augment:module")).iterator().next(); + final Module augmentModule = schemaContext.findModules(XMLNamespace.of("augment:module")).iterator().next(); final QName augmentChoice1QName = QName.create(augmentModule.getQNameModule(), "augment-choice1"); final QName augmentChoice2QName = QName.create(augmentChoice1QName, "augment-choice2"); final QName containerQName = QName.create(augmentChoice1QName, "case-choice-case-container1"); @@ -198,28 +198,19 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { public void rpcModuleInputTest() throws Exception { final String uri = "invoke-rpc-module:rpc-test"; mockBodyReader(uri, this.xmlBodyReader, true); - final InputStream inputStream = TestXmlBodyReader.class - .getResourceAsStream("/invoke-rpc/xml/rpc-input.xml"); - final NormalizedNodeContext returnValue = this.xmlBodyReader - .readFrom(null, null, null, this.mediaType, null, inputStream); + final InputStream inputStream = TestXmlBodyReader.class.getResourceAsStream("/invoke-rpc/xml/rpc-input.xml"); + final NormalizedNodeContext returnValue = this.xmlBodyReader.readFrom(null, null, null, this.mediaType, null, + inputStream); checkNormalizedNodeContext(returnValue); final ContainerNode contNode = (ContainerNode) returnValue.getData(); - final YangInstanceIdentifier yangCont = YangInstanceIdentifier.of(QName.create(contNode.getNodeType(), "cont")); - final java.util.Optional> contDataNodePotential = contNode - .getChild(yangCont.getLastPathArgument()); + final Optional contDataNodePotential = contNode.findChildByArg(new NodeIdentifier( + QName.create(contNode.getIdentifier().getNodeType(), "cont"))); assertTrue(contDataNodePotential.isPresent()); final ContainerNode contDataNode = (ContainerNode) contDataNodePotential.get(); - final YangInstanceIdentifier yangLeaf = - YangInstanceIdentifier.of(QName.create(contDataNode.getNodeType(), "lf")); - final java.util.Optional> leafDataNode = contDataNode.getChild( - yangLeaf.getLastPathArgument()); + final Optional leafDataNode = contDataNode.findChildByArg(new NodeIdentifier( + QName.create(contDataNode.getIdentifier().getNodeType(), "lf"))); assertTrue(leafDataNode.isPresent()); - assertTrue("lf-test".equalsIgnoreCase(leafDataNode.get().getValue().toString())); - } - - private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, - final NormalizedNodeContext nnContext) { - checkExpectValueNormalizeNodeContext(dataSchemaNode, nnContext, null); + assertTrue("lf-test".equalsIgnoreCase(leafDataNode.get().body().toString())); } private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, @@ -246,9 +237,9 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { checkNormalizedNodeContext(returnValue); // check if container was found both according to its name and namespace assertEquals("Not correct container found, name was ignored", - "foo-bar-container", returnValue.getData().getNodeType().getLocalName()); + "foo-bar-container", returnValue.getData().getIdentifier().getNodeType().getLocalName()); assertEquals("Not correct container found, namespace was ignored", - "foo:module", returnValue.getData().getNodeType().getNamespace().toString()); + "foo:module", returnValue.getData().getIdentifier().getNodeType().getNamespace().toString()); } /** @@ -268,9 +259,9 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { checkNormalizedNodeContext(returnValue); // check if container was found both according to its name and namespace assertEquals("Not correct container found, name was ignored", - "foo-bar-container", returnValue.getData().getNodeType().getLocalName()); + "foo-bar-container", returnValue.getData().getIdentifier().getNodeType().getLocalName()); assertEquals("Not correct container found, namespace was ignored", - "bar:module", returnValue.getData().getNodeType().getNamespace().toString()); + "bar:module", returnValue.getData().getIdentifier().getNodeType().getNamespace().toString()); } /**