X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fmodel-loader.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Futil%2FJsonXmlConverterTest.java;h=7a42edfc3e7f7e19e57925a73346967056230f82;hp=b6870f90ef8b4f71c8edb82dddef92c73df140ce;hb=7b1f813441f94261f43ec4f5bb0944ad2570fbdf;hpb=4dd316529148d07059d844197cdb676806bdc0c6

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