Make tests use UntrustedXML instead of XMLInputFactory

[yangtools.git] / yang / yang-data-codec-gson / src / test / java / org / opendaylight / yangtools / yang / data / codec / gson / YangModeledAnyXmlSupportTest.java

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java
index 4da8a82bac7eef21cc49413f85cd994e811f3292..43632532ed64ad4737f6ad0b0eb5b576256f0883 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java
@@ -24,11 +24,12 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.net.URISyntaxException;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opendaylight.yangtools.util.xml.UntrustedXML;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -63,8 +64,7 @@ public class YangModeledAnyXmlSupportTest {
         final InputStream resourceAsStream = YangModeledAnyXmlSupportTest.class.getResourceAsStream(
                 "/yang-modeled-anyxml/xml/baz.xml");
 
-        final XMLInputFactory factory = XMLInputFactory.newInstance();
-        final XMLStreamReader reader = factory.createXMLStreamReader(resourceAsStream);
+        final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
 
         final NormalizedNodeResult result = new NormalizedNodeResult();
 
@@ -78,6 +78,12 @@ public class YangModeledAnyXmlSupportTest {
         data = (ContainerNode) result.getResult();
     }
 
+    @AfterClass
+    public static void cleanup() {
+        schemaContext = null;
+        data = null;
+    }
+
     @Test
     public void jsonToNormalizedNodesTest() throws IOException, URISyntaxException, SAXException {
         final String inputJson = loadTextFile("/yang-modeled-anyxml/json/baz.json");