X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2Ftest%2Fproviders%2FTestJsonBodyReader.java;h=c1f463309beaf1b99ad3b156cdbe4acebc767424;hb=9ba2b4eca79bcc0e78099b133296801c8d45a6c4;hp=d233d9a3c99828c9f8a2b34b2023b8dc9d4043a0;hpb=d7d67c58c7aacbb320f6d3d43918f80ccc2808d1;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java index d233d9a3c9..c1f463309b 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java @@ -8,10 +8,13 @@ package org.opendaylight.controller.sal.rest.impl.test.providers; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import com.google.common.base.Optional; +import com.google.common.collect.Sets; import java.io.InputStream; +import java.net.URI; import javax.ws.rs.core.MediaType; import org.junit.BeforeClass; import org.junit.Test; @@ -25,6 +28,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; 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.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** @@ -48,7 +52,7 @@ public class TestJsonBodyReader extends AbstractBodyReaderTest { } @Override - MediaType getMediaType() { + protected MediaType getMediaType() { return new MediaType(MediaType.APPLICATION_XML, null); } @@ -63,6 +67,7 @@ public class TestJsonBodyReader extends AbstractBodyReaderTest { @Test public void moduleDataTest() throws Exception { final DataSchemaNode dataSchemaNode = schemaContext.getDataChildByName("cont"); + final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName()); final String uri = "instance-identifier-module:cont"; mockBodyReader(uri, jsonBodyReader, false); final InputStream inputStream = TestJsonBodyReader.class @@ -70,12 +75,15 @@ public class TestJsonBodyReader extends AbstractBodyReaderTest { final NormalizedNodeContext returnValue = jsonBodyReader .readFrom(null, null, null, mediaType, null, inputStream); checkNormalizedNodeContext(returnValue); - checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue); + checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII); } @Test public void moduleSubContainerDataPutTest() throws Exception { final DataSchemaNode dataSchemaNode = schemaContext.getDataChildByName("cont"); + QName cont1QName = QName.create(dataSchemaNode.getQName(), "cont1"); + final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName()).node(cont1QName); + final DataSchemaNode dataSchemaNodeOnPath = ((DataNodeContainer) dataSchemaNode).getDataChildByName(cont1QName); final String uri = "instance-identifier-module:cont/cont1"; mockBodyReader(uri, jsonBodyReader, false); final InputStream inputStream = TestJsonBodyReader.class @@ -83,12 +91,14 @@ public class TestJsonBodyReader extends AbstractBodyReaderTest { final NormalizedNodeContext returnValue = jsonBodyReader .readFrom(null, null, null, mediaType, null, inputStream); checkNormalizedNodeContext(returnValue); - checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, "cont1"); + checkExpectValueNormalizeNodeContext(dataSchemaNodeOnPath, returnValue, dataII); } @Test public void moduleSubContainerDataPostTest() throws Exception { final DataSchemaNode dataSchemaNode = schemaContext.getDataChildByName("cont"); + QName cont1QName = QName.create(dataSchemaNode.getQName(), "cont1"); + final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName()).node(cont1QName); final String uri = "instance-identifier-module:cont"; mockBodyReader(uri, jsonBodyReader, true); final InputStream inputStream = TestJsonBodyReader.class @@ -96,7 +106,51 @@ public class TestJsonBodyReader extends AbstractBodyReaderTest { final NormalizedNodeContext returnValue = jsonBodyReader .readFrom(null, null, null, mediaType, null, inputStream); checkNormalizedNodeContext(returnValue); - checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue); + checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII); + } + + @Test + public void moduleSubContainerAugmentDataPostTest() throws Exception { + final DataSchemaNode dataSchemaNode = schemaContext.getDataChildByName("cont"); + final Module augmentModule = schemaContext.findModuleByNamespace(new URI("augment:module")).iterator().next(); + QName contAugmentQName = QName.create(augmentModule.getQNameModule(), "cont-augment"); + YangInstanceIdentifier.AugmentationIdentifier augII = new YangInstanceIdentifier.AugmentationIdentifier( + Sets.newHashSet(contAugmentQName)); + final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName()) + .node(augII).node(contAugmentQName); + final String uri = "instance-identifier-module:cont"; + mockBodyReader(uri, jsonBodyReader, true); + final InputStream inputStream = TestXmlBodyReader.class + .getResourceAsStream("/instanceidentifier/json/json_augment_container.json"); + final NormalizedNodeContext returnValue = jsonBodyReader + .readFrom(null, null, null, mediaType, null, inputStream); + checkNormalizedNodeContext(returnValue); + checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII); + } + + //FIXME: Uncomment this when JsonParserStream works correctly with case augmentation with choice + //@Test + public void moduleSubContainerChoiceAugmentDataPostTest() throws Exception { + final DataSchemaNode dataSchemaNode = schemaContext.getDataChildByName("cont"); + final Module augmentModule = schemaContext.findModuleByNamespace(new URI("augment:module")).iterator().next(); + QName augmentChoice1QName = QName.create(augmentModule.getQNameModule(), "augment-choice1"); + QName augmentChoice2QName = QName.create(augmentChoice1QName, "augment-choice2"); + final QName containerQName = QName.create(augmentChoice1QName, "case-choice-case-container1"); + YangInstanceIdentifier.AugmentationIdentifier augChoice1II = new YangInstanceIdentifier.AugmentationIdentifier( + Sets.newHashSet(augmentChoice1QName)); + YangInstanceIdentifier.AugmentationIdentifier augChoice2II = new YangInstanceIdentifier.AugmentationIdentifier( + Sets.newHashSet(augmentChoice2QName)); + final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName()) + .node(augChoice1II).node(augmentChoice1QName).node(augChoice2II).node(augmentChoice2QName) + .node(containerQName); + final String uri = "instance-identifier-module:cont"; + mockBodyReader(uri, jsonBodyReader, true); + final InputStream inputStream = TestXmlBodyReader.class + .getResourceAsStream("/instanceidentifier/json/json_augment_choice_container.json"); + final NormalizedNodeContext returnValue = jsonBodyReader + .readFrom(null, null, null, mediaType, null, inputStream); + checkNormalizedNodeContext(returnValue); + checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII); } @Test @@ -105,37 +159,36 @@ public class TestJsonBodyReader extends AbstractBodyReaderTest { mockBodyReader(uri, jsonBodyReader, true); final InputStream inputStream = TestJsonBodyReader.class .getResourceAsStream("/invoke-rpc/json/rpc-input.json"); - final NormalizedNodeContext returnValue = jsonBodyReader - .readFrom(null, null, null, mediaType, null, inputStream); + final NormalizedNodeContext returnValue = jsonBodyReader.readFrom(null, + null, null, mediaType, null, inputStream); checkNormalizedNodeContext(returnValue); final ContainerNode inputNode = (ContainerNode) returnValue.getData(); - final YangInstanceIdentifier yangCont = YangInstanceIdentifier.of(QName.create(inputNode.getNodeType(), "cont")); - final Optional> contDataNode = inputNode.getChild(yangCont.getLastPathArgument()); + final YangInstanceIdentifier yangCont = YangInstanceIdentifier.of(QName + .create(inputNode.getNodeType(), "cont")); + final Optional> contDataNode = inputNode + .getChild(yangCont.getLastPathArgument()); assertTrue(contDataNode.isPresent()); assertTrue(contDataNode.get() instanceof ContainerNode); - final YangInstanceIdentifier yangleaf = YangInstanceIdentifier.of(QName.create(inputNode.getNodeType(), "lf")); - final Optional> leafDataNode = ((ContainerNode)contDataNode.get()).getChild(yangleaf.getLastPathArgument()); + final YangInstanceIdentifier yangleaf = YangInstanceIdentifier.of(QName + .create(inputNode.getNodeType(), "lf")); + final Optional> leafDataNode = ((ContainerNode) contDataNode + .get()).getChild(yangleaf.getLastPathArgument()); assertTrue(leafDataNode.isPresent()); - assertTrue("lf-test".equalsIgnoreCase(leafDataNode.get().getValue().toString())); + assertTrue("lf-test".equalsIgnoreCase(leafDataNode.get().getValue() + .toString())); } - private void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, + private void checkExpectValueNormalizeNodeContext( + final DataSchemaNode dataSchemaNode, final NormalizedNodeContext nnContext) { checkExpectValueNormalizeNodeContext(dataSchemaNode, nnContext, null); } private void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, - final NormalizedNodeContext nnContext, final String localQname) { - YangInstanceIdentifier dataNodeIdent = YangInstanceIdentifier.of(dataSchemaNode.getQName()); - - if (localQname != null && dataSchemaNode instanceof DataNodeContainer) { - final DataSchemaNode child = ((DataNodeContainer) dataSchemaNode).getDataChildByName(localQname); - dataNodeIdent = YangInstanceIdentifier.builder(dataNodeIdent).node(child.getQName()).build(); - assertTrue(nnContext.getInstanceIdentifierContext().getSchemaNode().equals(child)); - } else { - assertTrue(nnContext.getInstanceIdentifierContext().getSchemaNode().equals(dataSchemaNode)); - } - assertTrue(nnContext.getInstanceIdentifierContext().getInstanceIdentifier().equals(dataNodeIdent)); + final NormalizedNodeContext nnContext, + final YangInstanceIdentifier dataNodeIdent) { + assertEquals(dataSchemaNode, nnContext.getInstanceIdentifierContext().getSchemaNode()); + assertEquals(dataNodeIdent, nnContext.getInstanceIdentifierContext().getInstanceIdentifier()); assertNotNull(NormalizedNodes.findNode(nnContext.getData(), dataNodeIdent)); } }