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 / cnsn / to / json / test / CnSnToJsonLeafrefType.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java
index 21a46a6cc32b60de0e3db3c9c74e71c96e5385ec..07b3d55d53e793fc62afa68f370511dcea258bd7 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java
@@ -9,20 +9,10 @@ package org.opendaylight.controller.sal.restconf.impl.cnsn.to.json.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import javax.ws.rs.WebApplicationException;
-
 import org.junit.BeforeClass;
-import org.junit.Test;
-import org.opendaylight.controller.sal.rest.impl.StructuredDataToJsonProvider;
-import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider;
-import org.opendaylight.controller.sal.restconf.impl.test.TestUtils;
 import org.opendaylight.controller.sal.restconf.impl.test.YangAndXmlAndDataSchemaLoader;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 
 /**
  *
@@ -37,74 +27,11 @@ public class CnSnToJsonLeafrefType extends YangAndXmlAndDataSchemaLoader {
         dataLoad("/cnsn-to-json/leafref", 2, "main-module", "cont");
     }
 
-    @Test
-    public void leafrefAbsolutePathToExistingLeafTest() {
-        String json = toJson("/cnsn-to-json/leafref/xml/data_absolut_ref_to_existing_leaf.xml");
-        validateJson(".*\"lf3\":\\p{Blank}*\"true\".*", json);
-    }
-
-    @Test
-    public void leafrefRelativePathToExistingLeafTest() {
-        String json = toJson("/cnsn-to-json/leafref/xml/data_relativ_ref_to_existing_leaf.xml");
-        validateJson(".*\"lf2\":\\p{Blank}*\"121\".*", json);
-    }
-
-    /**
-     * Tests case when reference to not existing element is present. In this
-     * case value from single node is printed as string.
-     */
-    @Test
-    public void leafrefToNonExistingLeafTest() {
-        String json = toJson("/cnsn-to-json/leafref/xml/data_ref_to_non_existing_leaf.xml");
-        validateJson(".*\"lf5\":\\p{Blank}*\"137\".*", json);
-    }
-
-    /**
-     * Tests case when non leaf element is referenced. In this case value from
-     * single node is printed as string.
-     */
-    @Test
-    public void leafrefToNotLeafTest() {
-        String json = toJson("/cnsn-to-json/leafref/xml/data_ref_to_not_leaf.xml");
-        validateJson(".*\"cont-augment-module\\p{Blank}*:\\p{Blank}*lf6\":\\p{Blank}*\"44.33\".*", json);
-    }
-
-    /**
-     * Tests case when leaflist element is refers to leaf.
-     */
-    @Test
-    public void leafrefFromLeafListToLeafTest() {
-        String json = toJson("/cnsn-to-json/leafref/xml/data_relativ_ref_from_leaflist_to_existing_leaf.xml");
-        validateJson(
-                ".*\"cont-augment-module\\p{Blank}*:\\p{Blank}*lflst1\":\\p{Blank}*.*\"345\",\\p{Space}*\"346\",\\p{Space}*\"347\".*",
-                json);
-    }
-
-    /**
-     * Tests case when leaflist element is refers to leaf.
-     */
-    @Test
-    public void leafrefFromLeafrefToLeafrefTest() {
-        String json = toJson("/cnsn-to-json/leafref/xml/data_from_leafref_to_leafref.xml");
-        validateJson(".*\"cont-augment-module\\p{Blank}*:\\p{Blank}*lf7\":\\p{Blank}*\"200\".*", json);
-    }
-
-    private void validateJson(String regex, String value) {
+    private void validateJson(final String regex, final String value) {
         assertNotNull(value);
-        Pattern ptrn = Pattern.compile(regex, Pattern.DOTALL);
-        Matcher mtch = ptrn.matcher(value);
+        final Pattern ptrn = Pattern.compile(regex, Pattern.DOTALL);
+        final Matcher mtch = ptrn.matcher(value);
         assertTrue(mtch.matches());
     }
 
-    private String toJson(String xmlDataPath) {
-        try {
-            CompositeNode compositeNode = TestUtils.readInputToCnSn(xmlDataPath, XmlToCompositeNodeProvider.INSTANCE);
-            TestUtils.normalizeCompositeNode(compositeNode, modules, searchedModuleName + ":" + searchedDataSchemaName);
-            return TestUtils.writeCompNodeWithSchemaContextToOutput(compositeNode, modules, dataSchemaNode,
-                    StructuredDataToJsonProvider.INSTANCE);
-        } catch (WebApplicationException | IOException e) {
-        }
-        return "";
-    }
-
 }