Bug 2907 - corrections for upgrade to karaf 3.0.3

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / NormalizeNodeTest.java

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 7c354acc4077a4c1d50ad9da0d27e3a009973127..a2aff72d1fa8a01d7e77c544e85dffbe7154880d 100644 (file)
--- 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,16 +7,7 @@
  */
 package org.opendaylight.controller.sal.restconf.impl.test;
 
-import static org.junit.Assert.assertNotNull;
-
-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 {
 
@@ -25,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(final 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;
-    }
-
 }