*/
package org.opendaylight.yangtools.yang.data.codec.gson;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.loadTextFile;
import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.loadXmlToNormalizedNodes;
import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.normalizedNodesToJsonString;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import javax.xml.transform.dom.DOMSource;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
-import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
-public class AnyXmlSupportTest extends AbstractComplexJsonTest {
-
+class AnyXmlSupportTest extends AbstractComplexJsonTest {
private static final QName LF12_ANY = QName.create(CONT_1, "lf12-any");
private static final QName LF13_ANY = QName.create(CONT_1, "lf13-any");
private static final QName LF14_ANY = QName.create(CONT_1, "lf14-any");
@Test
- public void anyXmlNodeWithSimpleValueInContainer() throws IOException, URISyntaxException {
- final String inputJson = loadTextFile("/complexjson/anyxml-node-with-simple-value-in-container.json");
+ void anyXmlNodeWithSimpleValueInContainer() throws IOException, URISyntaxException {
+ final var inputJson = loadTextFile("/complexjson/anyxml-node-with-simple-value-in-container.json");
// deserialization
final var result = new NormalizationResultHolder();
assertNotNull(transformedInput);
// lf12-any check
- final DOMSource Lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY);
- final DOMSource Lf12AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf12-any", "100.5");
+ final var Lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY);
+ final var Lf12AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf12-any", "100.5");
verifyTransformedAnyXmlNodeValue(Lf12AnyExpectedValue, Lf12AnyActualValue);
// lf13-any check
- final DOMSource Lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY);
- final DOMSource Lf13AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf13-any", "true");
+ final var Lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY);
+ final var Lf13AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf13-any", "true");
verifyTransformedAnyXmlNodeValue(Lf13AnyExpectedValue, Lf13AnyActualValue);
// lf14-any check
- final DOMSource Lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY);
- final DOMSource Lf14AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf14-any", "null");
+ final var Lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY);
+ final var Lf14AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf14-any", "null");
verifyTransformedAnyXmlNodeValue(Lf14AnyExpectedValue, Lf14AnyActualValue);
- final String serializationResult = normalizedNodesToJsonString(transformedInput, schemaContext);
+ final var serializationResult = normalizedNodesToJsonString(transformedInput, schemaContext);
assertEquals(JsonParser.parseString(inputJson), JsonParser.parseString(serializationResult));
}
@Test
- public void anyXmlNodeWithCompositeValueInContainer() throws IOException, URISyntaxException {
- final String inputJson = loadTextFile("/complexjson/anyxml-node-with-composite-value-in-container.json");
+ void anyXmlNodeWithCompositeValueInContainer() throws IOException, URISyntaxException {
+ final var inputJson = loadTextFile("/complexjson/anyxml-node-with-composite-value-in-container.json");
final var result = new NormalizationResultHolder();
final var streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
assertNotNull(transformedInput);
// lf12-any check
- final DOMSource Lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY);
- final DOMSource Lf12AnyExpectedValue = createLf12AnyXmlCompositeValue("ns:complex:json", "lf12-any");
+ final var Lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY);
+ final var Lf12AnyExpectedValue = createLf12AnyXmlCompositeValue("ns:complex:json", "lf12-any");
verifyTransformedAnyXmlNodeValue(Lf12AnyExpectedValue, Lf12AnyActualValue);
// lf13-any check
- final DOMSource Lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY);
- final DOMSource Lf13AnyExpectedValue = createLf13AnyXmlCompositeValue("ns:complex:json", "lf13-any");
+ final var Lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY);
+ final var Lf13AnyExpectedValue = createLf13AnyXmlCompositeValue("ns:complex:json", "lf13-any");
verifyTransformedAnyXmlNodeValue(Lf13AnyExpectedValue, Lf13AnyActualValue);
// lf14-any check
- final DOMSource Lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY);
- final DOMSource Lf14AnyExpectedValue = createLf14AnyXmlCompositeValue("ns:complex:json", "lf14-any");
+ final var Lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY);
+ final var Lf14AnyExpectedValue = createLf14AnyXmlCompositeValue("ns:complex:json", "lf14-any");
verifyTransformedAnyXmlNodeValue(Lf14AnyExpectedValue, Lf14AnyActualValue);
// serialization
- final String serializationResult = normalizedNodesToJsonString(transformedInput, schemaContext);
+ final var serializationResult = normalizedNodesToJsonString(transformedInput, schemaContext);
assertEquals(JsonParser.parseString(loadTextFile("/bug8927/json/composite.json")),
JsonParser.parseString(serializationResult));
}
@Test
- public void bug8927TestComplexArrayWithOthers() throws Exception {
+ void bug8927TestComplexArrayWithOthers() throws Exception {
executebug8927Test("/bug8927/xml/complex_array_with_other_elements.xml",
"/bug8927/json/complex_array_with_other_elements.json");
}
@Test
- public void bug8927TestComplexArray() throws Exception {
+ void bug8927TestComplexArray() throws Exception {
executebug8927Test("/bug8927/xml/complex_array.xml", "/bug8927/json/complex_array.json");
}
@Test
- public void bug8927TestScalarArrayWithOthers() throws Exception {
+ void bug8927TestScalarArrayWithOthers() throws Exception {
executebug8927Test("/bug8927/xml/scalar_array_with_other_elements.xml",
"/bug8927/json/scalar_array_with_other_elements.json");
}
@Test
- public void bug8927TestScalarArray() throws Exception {
+ void bug8927TestScalarArray() throws Exception {
executebug8927Test("/bug8927/xml/scalar_array.xml", "/bug8927/json/scalar_array.json");
}
@Test
- public void yt1302TestFlatArray() throws Exception {
+ void yt1302TestFlatArray() throws Exception {
executeYt1302Test("/yt1302/xml/flat-array.xml", "/yt1302/json/flat-array.json");
}
@Test
- public void yt1302TestArrayOfArray() throws Exception {
+ void yt1302TestArrayOfArray() throws Exception {
executeYt1302Test("/yt1302/xml/array-of-array.xml", "/yt1302/json/array-of-array.json");
}
final var result = new NormalizationResultHolder();
loadXmlToNormalizedNodes(resourceAsStream, result, schemaContext);
- assertNotNull(result.getResult().data());
- assertTrue(result.getResult().data() instanceof ContainerNode);
-
- final DataContainerChild data = ((ContainerNode) result.getResult().data())
+ final var data = assertInstanceOf(ContainerNode.class, result.getResult().data())
.childByArg(new NodeIdentifier(QName.create(namespace, revision, localName)));
assertNotNull(data);
- final String jsonOutput = normalizedNodesToJsonString(data, schemaContext);
+ final var jsonOutput = normalizedNodesToJsonString(data, schemaContext);
assertEquals(JsonParser.parseReader(new FileReader(
new File(getClass().getResource(expectedJsonFile).toURI()), StandardCharsets.UTF_8)),
JsonParser.parseString(jsonOutput));
}
private static DOMSource getParsedAnyXmlValue(final NormalizedNode transformedInput, final QName anyxmlName) {
- assertTrue(transformedInput instanceof ContainerNode);
- final ContainerNode cont1 = (ContainerNode) transformedInput;
- final DataContainerChild child = cont1.childByArg(new NodeIdentifier(anyxmlName));
- assertTrue(child instanceof DOMSourceAnyxmlNode);
- final DOMSourceAnyxmlNode anyXmlNode = (DOMSourceAnyxmlNode) child;
- return anyXmlNode.body();
+ final var cont1 = assertInstanceOf(ContainerNode.class, transformedInput);
+ return assertInstanceOf(DOMSourceAnyxmlNode.class, cont1.childByArg(new NodeIdentifier(anyxmlName)))
+ .body();
}
private static void verifyTransformedAnyXmlNodeValue(final DOMSource expectedValue, final DOMSource actualValue) {
}
private static DOMSource createAnyXmlSimpleValue(final String ns, final String name, final String value) {
- final Document doc = UntrustedXML.newDocumentBuilder().newDocument();
- final Element rootElement = doc.createElementNS(ns, name);
+ final var doc = UntrustedXML.newDocumentBuilder().newDocument();
+ final var rootElement = doc.createElementNS(ns, name);
doc.appendChild(rootElement);
- final Text textNode = doc.createTextNode(value);
+ final var textNode = doc.createTextNode(value);
rootElement.appendChild(textNode);
return new DOMSource(doc.getDocumentElement());
}
private static DOMSource createLf12AnyXmlCompositeValue(final String ns, final String name) {
- final Document doc = UntrustedXML.newDocumentBuilder().newDocument();
- final Element rootElement = doc.createElementNS(ns, name);
+ final var doc = UntrustedXML.newDocumentBuilder().newDocument();
+ final var rootElement = doc.createElementNS(ns, name);
- final Element arrayElement1 = doc.createElement("array-element");
- final Text arrayElement1Text = doc.createTextNode("true");
+ final var arrayElement1 = doc.createElement("array-element");
+ final var arrayElement1Text = doc.createTextNode("true");
arrayElement1.appendChild(arrayElement1Text);
- final Element arrayElement2 = doc.createElement("array-element");
+ final var arrayElement2 = doc.createElement("array-element");
- final Element arrayElement2Baz = doc.createElement("baz");
- final Element bazArrayElement1 = doc.createElement("array-element");
- final Text bazArrayElement1Text = doc.createTextNode("120");
+ final var arrayElement2Baz = doc.createElement("baz");
+ final var bazArrayElement1 = doc.createElement("array-element");
+ final var bazArrayElement1Text = doc.createTextNode("120");
bazArrayElement1.appendChild(bazArrayElement1Text);
- final Element bazArrayElement2 = doc.createElement("array-element");
- final Text bazArrayElement2Text = doc.createTextNode("str-val");
+ final var bazArrayElement2 = doc.createElement("array-element");
+ final var bazArrayElement2Text = doc.createTextNode("str-val");
bazArrayElement2.appendChild(bazArrayElement2Text);
- final Element bazArrayElement3 = doc.createElement("array-element");
- final Text bazArrayElement3Text = doc.createTextNode("false");
+ final var bazArrayElement3 = doc.createElement("array-element");
+ final var bazArrayElement3Text = doc.createTextNode("false");
bazArrayElement3.appendChild(bazArrayElement3Text);
arrayElement2Baz.appendChild(bazArrayElement1);
arrayElement2.appendChild(arrayElement2Baz);
- final Element arrayElement3 = doc.createElement("array-element");
- final Element arrayElement3Foo = doc.createElement("foo");
- final Text fooText = doc.createTextNode("null");
+ final var arrayElement3 = doc.createElement("array-element");
+ final var arrayElement3Foo = doc.createElement("foo");
+ final var fooText = doc.createTextNode("null");
arrayElement3Foo.appendChild(fooText);
arrayElement3.appendChild(arrayElement3Foo);
}
private static DOMSource createLf13AnyXmlCompositeValue(final String ns, final String name) {
- final Document doc = UntrustedXML.newDocumentBuilder().newDocument();
- final Element rootElement = doc.createElementNS(ns, name);
+ final var doc = UntrustedXML.newDocumentBuilder().newDocument();
+ final var rootElement = doc.createElementNS(ns, name);
- final Element anyXmlArrayA = doc.createElement("anyxml-array-a");
+ final var anyXmlArrayA = doc.createElement("anyxml-array-a");
- final Element arrayAElement1 = doc.createElement("array-element");
- final Element arrayAElement1Foo = doc.createElement("foo");
- final Text fooText = doc.createTextNode("true");
+ final var arrayAElement1 = doc.createElement("array-element");
+ final var arrayAElement1Foo = doc.createElement("foo");
+ final var fooText = doc.createTextNode("true");
arrayAElement1Foo.appendChild(fooText);
arrayAElement1.appendChild(arrayAElement1Foo);
- final Element arrayAElement2 = doc.createElement("array-element");
- final Text arrayAElement2Text = doc.createTextNode("10");
+ final var arrayAElement2 = doc.createElement("array-element");
+ final var arrayAElement2Text = doc.createTextNode("10");
arrayAElement2.appendChild(arrayAElement2Text);
- final Element arrayAElement3 = doc.createElement("array-element");
- final Element arrayAElement3Bar = doc.createElement("bar");
- final Text barText = doc.createTextNode("false");
+ final var arrayAElement3 = doc.createElement("array-element");
+ final var arrayAElement3Bar = doc.createElement("bar");
+ final var barText = doc.createTextNode("false");
arrayAElement3Bar.appendChild(barText);
arrayAElement3.appendChild(arrayAElement3Bar);
anyXmlArrayA.appendChild(arrayAElement2);
anyXmlArrayA.appendChild(arrayAElement3);
- final Element anyXmlArrayB = doc.createElement("anyxml-array-b");
+ final var anyXmlArrayB = doc.createElement("anyxml-array-b");
- final Element arrayBElement1 = doc.createElement("array-element");
+ final var arrayBElement1 = doc.createElement("array-element");
final Text arrayBElement1Text = doc.createTextNode("1");
arrayBElement1.appendChild(arrayBElement1Text);
- final Element arrayBElement2 = doc.createElement("array-element");
+ final var arrayBElement2 = doc.createElement("array-element");
final Text arrayBElement2Text = doc.createTextNode("2");
arrayBElement2.appendChild(arrayBElement2Text);
- final Element arrayBElement3 = doc.createElement("array-element");
+ final var arrayBElement3 = doc.createElement("array-element");
- final Element arrayBElement3Element1 = doc.createElement("array-element");
- final Text arrayBElement3Element1Text = doc.createTextNode("4");
+ final var arrayBElement3Element1 = doc.createElement("array-element");
+ final var arrayBElement3Element1Text = doc.createTextNode("4");
arrayBElement3Element1.appendChild(arrayBElement3Element1Text);
final Element arrayBElement3Element2 = doc.createElement("array-element");
- final Text arrayBElement3Element2Text = doc.createTextNode("5");
+ final var arrayBElement3Element2Text = doc.createTextNode("5");
arrayBElement3Element2.appendChild(arrayBElement3Element2Text);
arrayBElement3.appendChild(arrayBElement3Element1);
arrayBElement3.appendChild(arrayBElement3Element2);
- final Element arrayBElement4 = doc.createElement("array-element");
- final Text arrayBElement4Text = doc.createTextNode("7");
+ final var arrayBElement4 = doc.createElement("array-element");
+ final var arrayBElement4Text = doc.createTextNode("7");
arrayBElement4.appendChild(arrayBElement4Text);
anyXmlArrayB.appendChild(arrayBElement1);
}
private static DOMSource createLf14AnyXmlCompositeValue(final String ns, final String name) {
- final Document doc = UntrustedXML.newDocumentBuilder().newDocument();
- final Element rootElement = doc.createElementNS(ns, name);
+ final var doc = UntrustedXML.newDocumentBuilder().newDocument();
+ final var rootElement = doc.createElementNS(ns, name);
- final Element anyXmlObjectA = doc.createElement("anyxml-object-a");
- final Element dataA1 = doc.createElement("data-a1");
+ final var anyXmlObjectA = doc.createElement("anyxml-object-a");
+ final var dataA1 = doc.createElement("data-a1");
final Text dataA1Text = doc.createTextNode("10");
dataA1.appendChild(dataA1Text);
- final Element dataA2 = doc.createElement("data-a2");
- final Text dataA2Text = doc.createTextNode("11");
+ final var dataA2 = doc.createElement("data-a2");
+ final var dataA2Text = doc.createTextNode("11");
dataA2.appendChild(dataA2Text);
anyXmlObjectA.appendChild(dataA1);
anyXmlObjectA.appendChild(dataA2);
- final Element anyXmlObjectB = doc.createElement("anyxml-object-b");
+ final var anyXmlObjectB = doc.createElement("anyxml-object-b");
- final Element childObjectB1 = doc.createElement("child-object-b1");
- final Element dataB1 = doc.createElement("data-b1");
- final Text dataB1Text = doc.createTextNode("5.5");
+ final var childObjectB1 = doc.createElement("child-object-b1");
+ final var dataB1 = doc.createElement("data-b1");
+ final var dataB1Text = doc.createTextNode("5.5");
dataB1.appendChild(dataB1Text);
childObjectB1.appendChild(dataB1);
- final Element childObjectB2 = doc.createElement("child-object-b2");
- final Element dataB2 = doc.createElement("data-b2");
- final Text dataB2Text = doc.createTextNode("b2-val");
+ final var childObjectB2 = doc.createElement("child-object-b2");
+ final var dataB2 = doc.createElement("data-b2");
+ final var dataB2Text = doc.createTextNode("b2-val");
dataB2.appendChild(dataB2Text);
childObjectB2.appendChild(dataB2);
Code Review / yangtools.git / blobdiff