X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FMultipleEqualNamesForDataNodesTest.java;h=8c017341e9e39b1f213b5ceebb11f983912fec9f;hp=478565f033df3a1c0a1b8e21cb1ce3fd4e5d9339;hb=13d48361d8c7b09a61bf6aaa37cda699b14f881a;hpb=cf3c39048445c63710c82c0b3fb86a5694d5644f diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MultipleEqualNamesForDataNodesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MultipleEqualNamesForDataNodesTest.java index 478565f033..8c017341e9 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MultipleEqualNamesForDataNodesTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MultipleEqualNamesForDataNodesTest.java @@ -7,22 +7,6 @@ */ package org.opendaylight.controller.sal.restconf.impl.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.util.List; -import java.util.Set; -import javax.ws.rs.ext.MessageBodyReader; -import org.junit.Test; -import org.opendaylight.controller.sal.rest.impl.JsonToCompositeNodeProvider; -import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider; -import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; -import org.opendaylight.controller.sal.restconf.impl.RestconfError; -import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorTag; -import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorType; -import org.opendaylight.yangtools.yang.data.api.Node; -import org.opendaylight.yangtools.yang.model.api.Module; /** * If more then one data element with equal name exists where container or leaf schema node should be present the @@ -32,53 +16,4 @@ import org.opendaylight.yangtools.yang.model.api.Module; */ public class MultipleEqualNamesForDataNodesTest { - @Test - public void multipleEqualNameDataNodeTestForContainerJsonTest() { - multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-container.json", - ErrorType.APPLICATION, ErrorTag.BAD_ELEMENT, JsonToCompositeNodeProvider.INSTANCE); - } - - @Test - public void multipleEqualNameDataNodeTestForLeafJsonTest() { - multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-leaf.json", ErrorType.PROTOCOL, - ErrorTag.MALFORMED_MESSAGE, JsonToCompositeNodeProvider.INSTANCE); - } - - @Test - public void multipleEqualNameDataNodeTestForContainerXmlTest() { - multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-container.xml", - ErrorType.APPLICATION, ErrorTag.BAD_ELEMENT, XmlToCompositeNodeProvider.INSTANCE); - } - - @Test - public void multipleEqualNameDataNodeTestForLeafXmlTest() { - multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-leaf.xml", ErrorType.APPLICATION, - ErrorTag.BAD_ELEMENT, XmlToCompositeNodeProvider.INSTANCE); - } - - private void multipleEqualNameDataNodeTest(String path, ErrorType errorType, ErrorTag errorTag, - MessageBodyReader> messageBodyReader) { - try { - Node node = TestUtils.readInputToCnSn(path, false, messageBodyReader); - assertNotNull(node); - - Set modules = null; - modules = TestUtils.loadModulesFrom("/equal-data-node-names/yang"); - assertNotNull(modules); - - TestUtils.normalizeCompositeNode(node, modules, "equal-data-node-names" + ":" + "cont"); - fail("Exception RestconfDocumentedException should be raised"); - } catch (RestconfDocumentedException e) { - List errors = e.getErrors(); - assertNotNull(errors); - - assertEquals(1, errors.size()); - - RestconfError restconfError = errors.get(0); - - assertEquals(errorType, restconfError.getErrorType()); - assertEquals(errorTag, restconfError.getErrorTag()); - } - } - }