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%2Ftest%2FNormalizeNodeTest.java;h=a2aff72d1fa8a01d7e77c544e85dffbe7154880d;hb=c8023e980b7f421d0af06b99fd66380b72d3a8e0;hp=f5aa453fa245d2e4f9273350f35dcb1c47cfbd47;hpb=ec82a960337ba51c2e896863a668dcf8fbcfcb6b;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java index f5aa453fa2..a2aff72d1f 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java @@ -7,17 +7,7 @@ */ package org.opendaylight.controller.sal.restconf.impl.test; -import static org.junit.Assert.*; - -import java.net.URI; -import java.net.URISyntaxException; - import org.junit.BeforeClass; -import org.junit.Test; -import org.opendaylight.controller.sal.restconf.impl.CompositeNodeWrapper; -import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; -import org.opendaylight.controller.sal.restconf.impl.SimpleNodeWrapper; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; public class NormalizeNodeTest extends YangAndXmlAndDataSchemaLoader { @@ -26,45 +16,4 @@ public class NormalizeNodeTest extends YangAndXmlAndDataSchemaLoader { dataLoad("/normalize-node/yang/"); } - @Test(expected=RestconfDocumentedException.class) - public void namespaceNotNullAndInvalidNamespaceAndNoModuleNameTest() { - - TestUtils.normalizeCompositeNode(prepareCnSn("wrongnamespace"), modules, schemaNodePath); - } - - @Test - public void namespaceNullTest() { - - TestUtils.normalizeCompositeNode(prepareCnSn(null), modules, schemaNodePath); - } - - @Test - public void namespaceValidNamespaceTest() { - - TestUtils.normalizeCompositeNode(prepareCnSn("normalize:node:module"), modules, schemaNodePath); - } - - @Test - public void namespaceValidModuleNameTest() { - - TestUtils.normalizeCompositeNode(prepareCnSn("normalize-node-module"), modules, schemaNodePath); - } - - private CompositeNode prepareCnSn(String namespace) { - URI uri = null; - if (namespace != null) { - try { - uri = new URI(namespace); - } catch (URISyntaxException e) { - } - assertNotNull(uri); - } - - SimpleNodeWrapper lf1 = new SimpleNodeWrapper(uri, "lf1", 43); - CompositeNodeWrapper cont = new CompositeNodeWrapper(uri, "cont"); - cont.addValue(lf1); - - return cont; - } - }