}
private void writeStartElement(final QName qname) throws XMLStreamException {
- String ns = qname.getNamespace().toString();
+ final String ns = qname.getNamespace().toString();
+ final NamespaceContext context = writer.getNamespaceContext();
+ final boolean needDefaultNs;
+ if (context != null) {
+ final String parentNs = context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX);
+ needDefaultNs = !ns.equals(parentNs);
+ } else {
+ needDefaultNs = false;
+ }
+
writer.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, qname.getLocalName(), ns);
- if (writer.getNamespaceContext() != null) {
- String parentNs = writer.getNamespaceContext().getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX);
- if (!ns.equals(parentNs)) {
- writer.writeDefaultNamespace(ns);
- }
+ if (needDefaultNs) {
+ writer.writeDefaultNamespace(ns);
}
}
import java.io.StringWriter;
import java.net.URI;
import java.util.Optional;
-import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.OutputKeys;
import org.xml.sax.SAXException;
public class Bug5446Test extends XMLTestCase {
- private static final XMLOutputFactory XML_FACTORY;
-
- static {
- XML_FACTORY = XMLOutputFactory.newFactory();
- XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE);
- }
-
private static final QNameModule FOO_MODULE = QNameModule.create(URI.create("foo"), Revision.of("2015-11-05"));
private static final QName ROOT_QNAME = QName.create(FOO_MODULE, "root");
private static final QName IP_ADDRESS_QNAME = QName.create(FOO_MODULE, "ip-address");
NormalizedNodeStreamWriter normalizedNodeStreamWriter = null;
XMLStreamWriter writer = null;
try {
- writer = XML_FACTORY.createXMLStreamWriter(result);
+ writer = TestFactories.DEFAULT_OUTPUT_FACTORY.createXMLStreamWriter(result);
normalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(writer, context);
normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(normalizedNodeStreamWriter);
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.yangtools.yang.data.codec.xml;
import static java.util.Objects.requireNonNull;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
+import java.util.Collection;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+@RunWith(Parameterized.class)
public class Bug8745Test {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Object[]> data() {
+ return TestFactories.junitParameters();
+ }
+
+ private static SchemaContext SCHEMA_CONTEXT;
+
+ private final XMLOutputFactory factory;
+
+ public Bug8745Test(final String factoryMode, final XMLOutputFactory factory) {
+ this.factory = factory;
+ }
+
+ @BeforeClass
+ public static void beforeClass() {
+ SCHEMA_CONTEXT = YangParserTestUtils.parseYangResource("/bug8745/foo.yang");
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ SCHEMA_CONTEXT = null;
+ }
@Test
public void testParsingAttributes() throws Exception {
- final SchemaContext schemaContext = YangParserTestUtils.parseYangResource("/bug8745/foo.yang");
final QName contWithAttributes = QName.create("foo", "cont-with-attributes");
final ContainerSchemaNode contWithAttr = (ContainerSchemaNode) SchemaContextUtil.findDataSchemaNode(
- schemaContext, SchemaPath.create(true, contWithAttributes));
+ SCHEMA_CONTEXT, SchemaPath.create(true, contWithAttributes));
final Document doc = loadDocument("/bug8745/foo.xml");
final DOMSource domSource = new DOMSource(doc.getDocumentElement());
final DOMResult domResult = new DOMResult(UntrustedXML.newDocumentBuilder().newDocument());
- final XMLOutputFactory outputfactory = XMLOutputFactory.newInstance();
- outputfactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-
- final XMLStreamWriter xmlStreamWriter = outputfactory.createXMLStreamWriter(domResult);
+ final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult);
final NormalizedNodeStreamWriter streamWriter = XMLStreamNormalizedNodeStreamWriter.create(
- xmlStreamWriter, schemaContext);
+ xmlStreamWriter, SCHEMA_CONTEXT);
final InputStream resourceAsStream = Bug8745Test.class.getResourceAsStream("/bug8745/foo.xml");
// final XMLStreamReader reader = inputFactory.createXMLStreamReader(resourceAsStream);
final XMLStreamReader reader = new DOMSourceXMLStreamReader(domSource);
- final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, contWithAttr);
+ final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, SCHEMA_CONTEXT, contWithAttr);
xmlParser.parse(reader);
XMLUnit.setIgnoreWhitespace(true);
import java.io.InputStream;
import java.io.StringWriter;
+import java.util.Collection;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
+@RunWith(Parameterized.class)
public class Bug8803Test {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Object[]> data() {
+ return TestFactories.junitParameters();
+ }
+
+ private static SchemaContext SCHEMA_CONTEXT;
+
+ private final XMLOutputFactory factory;
+
+ public Bug8803Test(final String factoryMode, final XMLOutputFactory factory) {
+ this.factory = factory;
+ }
+
+ @BeforeClass
+ public static void beforeClass() {
+ SCHEMA_CONTEXT = YangParserTestUtils.parseYangResourceDirectory("/bug8803");
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ SCHEMA_CONTEXT = null;
+ }
@Test
public void test() throws Exception {
- final SchemaContext schemaContext = YangParserTestUtils.parseYangResourceDirectory("/bug8803");
final SchemaPath topContPath = SchemaPath.create(true, QName.create("foo-ns", "top-cont"));
- final SchemaNode dataSchemaNode = SchemaContextUtil.findDataSchemaNode(schemaContext, topContPath);
+ final SchemaNode dataSchemaNode = SchemaContextUtil.findDataSchemaNode(SCHEMA_CONTEXT, topContPath);
assertTrue(dataSchemaNode instanceof ContainerSchemaNode);
final ContainerSchemaNode topContSchema = (ContainerSchemaNode) dataSchemaNode;
final NormalizedNodeResult result = new NormalizedNodeResult();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
- final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, topContSchema);
+ final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, SCHEMA_CONTEXT, topContSchema);
xmlParser.parse(reader);
final NormalizedNode<?, ?> transformedInput = result.getResult();
assertNotNull(transformedInput);
// serialization
final StringWriter writer = new StringWriter();
- final XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
- // switching NS repairing to false does not help
- outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
- final XMLStreamWriter xmlStreamWriter = outputFactory.createXMLStreamWriter(writer);
+ final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(writer);
final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(
- xmlStreamWriter, schemaContext);
+ xmlStreamWriter, SCHEMA_CONTEXT);
final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(
xmlNormalizedNodeStreamWriter);
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
+import java.util.Collection;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+@RunWith(Parameterized.class)
public class DOMSourceXMLStreamReaderTest {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Object[]> data() {
+ return TestFactories.junitParameters();
+ }
+
+ private static SchemaContext SCHEMA_CONTEXT;
+
+ private final XMLOutputFactory factory;
+
+ public DOMSourceXMLStreamReaderTest(final String factoryMode, final XMLOutputFactory factory) {
+ this.factory = factory;
+ }
+
+ @BeforeClass
+ public static void beforeClass() {
+ SCHEMA_CONTEXT = YangParserTestUtils.parseYangResourceDirectory("/dom-reader-test");
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ SCHEMA_CONTEXT = null;
+ }
@Test
public void test() throws Exception {
- final SchemaContext schemaContext = YangParserTestUtils.parseYangResourceDirectory("/dom-reader-test");
final ContainerSchemaNode outerContainerSchema = (ContainerSchemaNode) SchemaContextUtil
- .findNodeInSchemaContext(schemaContext, ImmutableList.of(QName.create("foo-ns", "top-cont")));
+ .findNodeInSchemaContext(SCHEMA_CONTEXT, ImmutableList.of(QName.create("foo-ns", "top-cont")));
assertNotNull(outerContainerSchema);
// deserialization
final NormalizedNodeResult result = new NormalizedNodeResult();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
- final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, outerContainerSchema);
+ final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, SCHEMA_CONTEXT, outerContainerSchema);
xmlParser.parse(domXMLReader);
final NormalizedNode<?, ?> transformedInput = result.getResult();
assertNotNull(transformedInput);
// serialization
//final StringWriter writer = new StringWriter();
final DOMResult domResult = new DOMResult(UntrustedXML.newDocumentBuilder().newDocument());
- final XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
- outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
- final XMLStreamWriter xmlStreamWriter = outputFactory.createXMLStreamWriter(domResult);
+ final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult);
final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(
- xmlStreamWriter, schemaContext);
+ xmlStreamWriter, SCHEMA_CONTEXT);
final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(
xmlNormalizedNodeStreamWriter);
private static final String NAMESPACE = "urn:opendaylight:params:xml:ns:yang:controller:test";
private static final Revision REVISION = Revision.of("2014-03-13");
- static final XMLOutputFactory XML_FACTORY;
-
- static {
- XML_FACTORY = XMLOutputFactory.newFactory();
- XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE);
- }
-
private static ContainerNode augmentChoiceHell2() {
final NodeIdentifier container = getNodeIdentifier("container");
final QName augmentChoice1QName = QName.create(container.getNodeType(), "augment-choice1");
private final ContainerSchemaNode containerNode;
private final String xmlPath;
+ @Test
+ public void testTranslationRepairing() throws Exception {
+ testTranslation(TestFactories.REPAIRING_OUTPUT_FACTORY);
+ }
+
@Test
public void testTranslation() throws Exception {
+ testTranslation(TestFactories.DEFAULT_OUTPUT_FACTORY);
+ }
+
+ private void testTranslation(final XMLOutputFactory factory) throws Exception {
final InputStream resourceAsStream = XmlToNormalizedNodesTest.class.getResourceAsStream(xmlPath);
final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
final Document document = UntrustedXML.newDocumentBuilder().newDocument();
final DOMResult domResult = new DOMResult(document);
- final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
- outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-
- final XMLStreamWriter xmlStreamWriter = outputFactory.createXMLStreamWriter(domResult);
+ final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult);
final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter
.create(xmlStreamWriter, schema);
import java.io.InputStream;
import java.io.StringWriter;
import java.net.URI;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener;
import org.custommonkey.xmlunit.XMLTestCase;
import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+@RunWith(Parameterized.class)
public class NormalizedNodesToXmlTest {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Object[]> data() {
+ return TestFactories.junitParameters();
+ }
private QNameModule bazModule;
private QName mySecondKeyLeaf;
private QName myLeafInList3;
+ private static SchemaContext SCHEMA_CONTEXT;
+
+ private final XMLOutputFactory factory;
+
+ public NormalizedNodesToXmlTest(final String factoryMode, final XMLOutputFactory factory) {
+ this.factory = factory;
+ }
+
+ @BeforeClass
+ public static void beforeClass() {
+ SCHEMA_CONTEXT = YangParserTestUtils.parseYangResource("/baz.yang");
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ SCHEMA_CONTEXT = null;
+ }
+
@Before
public void setup() {
bazModule = QNameModule.create(URI.create("baz-namespace"));
@Test
public void testNormalizedNodeToXmlSerialization() throws XMLStreamException, IOException, SAXException {
- final SchemaContext schemaContext = YangParserTestUtils.parseYangResource("/baz.yang");
-
final Document doc = loadDocument("/baz.xml");
final DOMResult domResult = new DOMResult(UntrustedXML.newDocumentBuilder().newDocument());
- final XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-
final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult);
final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(
- xmlStreamWriter, schemaContext);
+ xmlStreamWriter, SCHEMA_CONTEXT);
final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(
xmlNormalizedNodeStreamWriter);
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
-import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
-import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
import org.xml.sax.SAXException;
+@RunWith(Parameterized.class)
public class SchemaOrderedNormalizedNodeWriterTest {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Object[]> data() {
+ return TestFactories.junitParameters();
+ }
private static final String EXPECTED_1 = ""
- + "<root>\n"
+ + "<root xmlns=\"foo\">\n"
+ " <policy>\n"
+ " <name>policy1</name>\n"
+ " <rule>\n"
private static final String EXPECTED_2 = ""
- + "<root>\n"
+ + "<root xmlns=\"order\">\n"
+ " <id>id1</id>\n"
+ " <cont>\n"
+ " <content>content1</content>\n"
private static final String POLICY_NODE = "policy";
private static final String ORDER_NAMESPACE = "order";
+ private final XMLOutputFactory factory;
- @Before
- public void setUp() {
+ public SchemaOrderedNormalizedNodeWriterTest(final String factoryMode, final XMLOutputFactory factory) {
+ this.factory = factory;
XMLUnit.setIgnoreWhitespace(true);
}
@Test
- public void testWrite() throws XMLStreamException, FactoryConfigurationError, IOException, SAXException {
+ public void testWrite() throws XMLStreamException, IOException, SAXException {
final StringWriter stringWriter = new StringWriter();
- final XMLStreamWriter xmlStreamWriter = XMLOutputFactory.newFactory().createXMLStreamWriter(stringWriter);
+ final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(stringWriter);
SchemaContext schemaContext = getSchemaContext("/bug1848/foo.yang");
NormalizedNodeStreamWriter writer = XMLStreamNormalizedNodeStreamWriter.create(xmlStreamWriter, schemaContext);
}
@Test
- public void testWriteOrder() throws Exception {
+ public void testWriteOrder() throws XMLStreamException, IOException, SAXException {
final StringWriter stringWriter = new StringWriter();
- final XMLStreamWriter xmlStreamWriter = XMLOutputFactory.newFactory().createXMLStreamWriter(stringWriter);
+ final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(stringWriter);
SchemaContext schemaContext = getSchemaContext("/bug1848/order.yang");
NormalizedNodeStreamWriter writer = XMLStreamNormalizedNodeStreamWriter.create(xmlStreamWriter, schemaContext);
import java.io.StringWriter;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import org.custommonkey.xmlunit.XMLUnit;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+@RunWith(Parameterized.class)
public class SchemalessXMLStreamNormalizedNodeStreamWriterTest {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Object[]> data() {
+ return TestFactories.junitParameters();
+ }
+
+ private final XMLOutputFactory factory;
private QNameModule foobarModule;
private DOMSource anyxmlDomSource;
+ public SchemalessXMLStreamNormalizedNodeStreamWriterTest(final String factoryMode, final XMLOutputFactory factory) {
+ this.factory = factory;
+ }
+
@Before
public void setup() {
foobarModule = QNameModule.create(URI.create("foobar-namespace"), Revision.of("2016-09-19"));
final DOMResult domResult = new DOMResult(UntrustedXML.newDocumentBuilder().newDocument());
- final XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-
final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult);
final NormalizedNodeStreamWriter schemalessXmlNormalizedNodeStreamWriter =
--- /dev/null
+/*
+ * Copyright (c) 2019 Pantheon Technologies, s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.data.codec.xml;
+
+import java.util.Arrays;
+import java.util.Collection;
+import javax.xml.stream.XMLOutputFactory;
+
+final class TestFactories {
+ /**
+ * Non-repairing XMLOutputFactory.
+ */
+ static final XMLOutputFactory DEFAULT_OUTPUT_FACTORY = XMLOutputFactory.newFactory();
+
+ /**
+ * Repairing XMLOuputFactory.
+ */
+ static final XMLOutputFactory REPAIRING_OUTPUT_FACTORY;
+
+ static {
+ REPAIRING_OUTPUT_FACTORY = XMLOutputFactory.newFactory();
+ REPAIRING_OUTPUT_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
+ }
+
+ static Collection<Object[]> junitParameters() {
+ return Arrays.asList(new Object[][] {
+ { "default", DEFAULT_OUTPUT_FACTORY },
+ { "repairing", REPAIRING_OUTPUT_FACTORY },
+ });
+ }
+
+ private TestFactories() {
+
+ }
+}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.yangtools.yang.data.codec.xml;
import static org.hamcrest.CoreMatchers.containsString;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import org.custommonkey.xmlunit.Diff;
void accept(XMLStreamWriter writer) throws XMLStreamException;
}
- public static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newFactory();
-
private static SchemaContext schemaContext;
private static Module leafRefModule;
@Test
public void testWriteAttribute() throws Exception {
final ByteArrayOutputStream out = new ByteArrayOutputStream();
- final XMLStreamWriter writer = XML_OUTPUT_FACTORY.createXMLStreamWriter(out);
+ final XMLStreamWriter writer = TestFactories.DEFAULT_OUTPUT_FACTORY.createXMLStreamWriter(out);
writer.writeStartElement("element");
QName name = getAttrQName("namespace", "2012-12-12", "attr", Optional.of("prefix"));
private static String createXml(XMLStreamWriterConsumer consumer) throws XMLStreamException, IOException {
final ByteArrayOutputStream out = new ByteArrayOutputStream();
- final XMLStreamWriter writer = XML_OUTPUT_FACTORY.createXMLStreamWriter(out);
+ final XMLStreamWriter writer = TestFactories.DEFAULT_OUTPUT_FACTORY.createXMLStreamWriter(out);
consumer.accept(writer);
import java.io.InputStream;
import java.io.StringWriter;
import java.net.URI;
+import java.util.Collection;
import java.util.Optional;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamResult;
import org.custommonkey.xmlunit.XMLTestCase;
import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+@RunWith(Parameterized.class)
public class YangModeledAnyXMLSerializationTest extends XMLTestCase {
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<Object[]> data() {
+ return TestFactories.junitParameters();
+ }
private final QNameModule bazModuleQName = QNameModule.create(URI.create("baz"));
private final QName myAnyXMLDataBaz = QName.create(bazModuleQName, "my-anyxml-data");
private final QName bazQName = QName.create(bazModuleQName, "baz");
private final QName myContainer2QName = QName.create(bazModuleQName, "my-container-2");
- private final SchemaContext schemaContext;
- public YangModeledAnyXMLSerializationTest() {
- schemaContext = YangParserTestUtils.parseYangResourceDirectory("/anyxml-support/serialization");
+ private static SchemaContext SCHEMA_CONTEXT;
+
+ private final XMLOutputFactory factory;
+
+ public YangModeledAnyXMLSerializationTest(final String factoryMode, final XMLOutputFactory factory) {
+ this.factory = factory;
+ }
+
+ @BeforeClass
+ public static void beforeClass() {
+ SCHEMA_CONTEXT = YangParserTestUtils.parseYangResourceDirectory("/anyxml-support/serialization");
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ SCHEMA_CONTEXT = null;
}
@Test
public void testSerializationOfBaz() throws Exception {
final InputStream resourceAsStream = XmlToNormalizedNodesTest.class.getResourceAsStream(
"/anyxml-support/serialization/baz.xml");
- final Module bazModule = schemaContext.findModules("baz").iterator().next();
+ final Module bazModule = SCHEMA_CONTEXT.findModules("baz").iterator().next();
final ContainerSchemaNode bazCont = (ContainerSchemaNode) bazModule.getDataChildByName(
QName.create(bazModule.getQNameModule(), "baz"));
assertNotNull(bazCont);
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
- final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, bazCont);
+ final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, SCHEMA_CONTEXT, bazCont);
xmlParser.parse(reader);
final NormalizedNode<?, ?> transformedInput = result.getResult();
YangModeledAnyXmlNode yangModeledAnyXmlNode = (YangModeledAnyXmlNode) bazContainerChild.get();
DataSchemaNode schemaOfAnyXmlData = yangModeledAnyXmlNode.getSchemaOfAnyXmlData();
- SchemaNode myContainer2SchemaNode = SchemaContextUtil.findDataSchemaNode(schemaContext,
+ SchemaNode myContainer2SchemaNode = SchemaContextUtil.findDataSchemaNode(SCHEMA_CONTEXT,
SchemaPath.create(true, bazQName, myContainer2QName));
assertTrue(myContainer2SchemaNode instanceof ContainerSchemaNode);
assertEquals(myContainer2SchemaNode, schemaOfAnyXmlData);
final Document document = UntrustedXML.newDocumentBuilder().newDocument();
final DOMResult domResult = new DOMResult(document);
- final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
- outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-
- final XMLStreamWriter xmlStreamWriter = outputFactory.createXMLStreamWriter(domResult);
+ final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult);
final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter
- .create(xmlStreamWriter, schemaContext);
+ .create(xmlStreamWriter, SCHEMA_CONTEXT);
final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(
xmlNormalizedNodeStreamWriter);
Code Review / yangtools.git / commitdiff