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%2Frestconf%2Fimpl%2Fxml%2Fto%2Fcnsn%2Ftest%2FXmlAugmentedElementToCnSnTest.java;h=2a6f7dead46107285c4df59e96213e679117b75c;hb=9ba2b4eca79bcc0e78099b133296801c8d45a6c4;hp=e992e1214e9b44af05bf76bc0091afc623d11613;hpb=48daeb11697dbb83f554b64fe8702e21de3e0a12;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java index e992e1214e..2a6f7dead4 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java @@ -7,35 +7,7 @@ */ package org.opendaylight.controller.sal.restconf.impl.xml.to.cnsn.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Set; -import org.junit.Test; -import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider; -import org.opendaylight.controller.sal.restconf.impl.test.TestUtils; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.api.Node; -import org.opendaylight.yangtools.yang.model.api.Module; public class XmlAugmentedElementToCnSnTest { - @Test - public void loadDataAugmentedSchemaMoreEqualNamesTest() { - loadAndNormalizeData("/common/augment/xml/dataa.xml", "/common/augment/yang", "main", "cont"); - loadAndNormalizeData("/common/augment/xml/datab.xml", "/common/augment/yang", "main", "cont"); - } - - private void loadAndNormalizeData(String xmlPath, String yangPath, String topLevelElementName, String moduleName) { - Node node = TestUtils.readInputToCnSn(xmlPath, false, - XmlToCompositeNodeProvider.INSTANCE); - assertTrue(node instanceof CompositeNode); - CompositeNode cnSn = (CompositeNode)node; - - Set modules = TestUtils.loadModulesFrom(yangPath); - - assertNotNull(modules); - TestUtils.normalizeCompositeNode(cnSn, modules, topLevelElementName + ":" + moduleName); - } - }