Revisions made to the Model Loader to use Babel

[aai/model-loader.git] / src / test / java / org / onap / aai / modelloader / util / JsonXmlConverterTest.java

diff --git a/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java b/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java
index b6870f9..7a42edf 100644 (file)
--- a/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java
+++ b/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java
@@ -26,10 +26,8 @@ import static org.junit.Assert.assertTrue;
 import java.io.ByteArrayInputStream;\r
 import java.nio.file.Files;\r
 import java.nio.file.Paths;\r
-\r
 import javax.xml.parsers.DocumentBuilder;\r
 import javax.xml.parsers.DocumentBuilderFactory;\r
-\r
 import org.junit.Test;\r
 import org.onap.aai.modelloader.util.JsonXmlConverter;\r
 import org.w3c.dom.Document;\r
@@ -38,43 +36,44 @@ import org.w3c.dom.NodeList;
 \r
 public class JsonXmlConverterTest {\r
 \r
-  @Test\r
-  public void testConversion() throws Exception {\r
-       final String XML_MODEL_FILE = "src/test/resources/models/l3-network-widget.xml";\r
-       final String JSON_MODEL_FILE = "src/test/resources/models/l3-network-widget.json";\r
+    @Test\r
+    public void testConversion() throws Exception {\r
+        final String XML_MODEL_FILE = "src/test/resources/models/l3-network-widget.xml";\r
+        final String JSON_MODEL_FILE = "src/test/resources/models/l3-network-widget.json";\r
 \r
-    try {\r
-      byte[] encoded = Files.readAllBytes(Paths.get(XML_MODEL_FILE));\r
-      String originalXML = new String(encoded);\r
+        try {\r
+            byte[] encoded = Files.readAllBytes(Paths.get(XML_MODEL_FILE));\r
+            String originalXML = new String(encoded);\r
 \r
-      assertFalse(JsonXmlConverter.isValidJson(originalXML));\r
+            assertFalse(JsonXmlConverter.isValidJson(originalXML));\r
 \r
-      encoded = Files.readAllBytes(Paths.get(JSON_MODEL_FILE));\r
-      String originalJSON = new String(encoded);\r
+            encoded = Files.readAllBytes(Paths.get(JSON_MODEL_FILE));\r
+            String originalJSON = new String(encoded);\r
 \r
-      assertTrue(JsonXmlConverter.isValidJson(originalJSON));\r
+            assertTrue(JsonXmlConverter.isValidJson(originalJSON));\r
 \r
-      String xmlFromJson = JsonXmlConverter.convertJsonToXml(originalJSON);\r
+            String xmlFromJson = JsonXmlConverter.convertJsonToXml(originalJSON);\r
 \r
-      // Spot check one of the attributes\r
-      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\r
-      DocumentBuilder builder = factory.newDocumentBuilder();\r
-      Document doc = builder.parse(new ByteArrayInputStream(xmlFromJson.getBytes()));\r
-      NodeList nodeList = doc.getDocumentElement().getChildNodes();\r
+            // Spot check one of the attributes\r
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\r
+            factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);\r
+            DocumentBuilder builder = factory.newDocumentBuilder();\r
+            Document doc = builder.parse(new ByteArrayInputStream(xmlFromJson.getBytes()));\r
+            NodeList nodeList = doc.getDocumentElement().getChildNodes();\r
 \r
-      String modelVid = "notFound";\r
-      for (int i = 0; i < nodeList.getLength(); i++) {\r
-        Node currentNode = nodeList.item(i);\r
-        if (currentNode.getNodeName().equals("model-invariant-id")) {\r
-          modelVid = currentNode.getTextContent();\r
-          break;\r
-        }\r
-      }\r
+            String modelVid = "notFound";\r
+            for (int i = 0; i < nodeList.getLength(); i++) {\r
+                Node currentNode = nodeList.item(i);\r
+                if (currentNode.getNodeName().equals("model-invariant-id")) {\r
+                    modelVid = currentNode.getTextContent();\r
+                    break;\r
+                }\r
+            }\r
 \r
-      assertTrue(modelVid.equals("3d560d81-57d0-438b-a2a1-5334dba0651a"));\r
-    } catch (Exception e) {\r
-      e.printStackTrace();\r
-      assertTrue(false);\r
+            assertTrue(modelVid.equals("3d560d81-57d0-438b-a2a1-5334dba0651a"));\r
+        } catch (Exception e) {\r
+            e.printStackTrace();\r
+            assertTrue(false);\r
+        }\r
     }\r
-  }\r
 }\r