Integrate RestconfNormalizedNodeWriter

[netconf.git] / restconf / restconf-nb / src / test / java / org / opendaylight / restconf / nb / rfc8040 / jersey / providers / XmlNormalizedNodeBodyWriterTest.java

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java
index 0545672d4ecc6cbe6d3640024e5b1aefe0ef3b6e..c19e53c9c32d0f730d5a604e4e92dba9e3ea6042 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java
@@ -17,11 +17,13 @@ import javax.ws.rs.core.MediaType;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.restconf.api.query.PrettyPrintParam;
 import org.opendaylight.restconf.nb.rfc8040.AbstractInstanceIdentifierTest;
 import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload;
+import org.opendaylight.restconf.nb.rfc8040.legacy.WriterParameters;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
@@ -33,7 +35,8 @@ public class XmlNormalizedNodeBodyWriterTest extends AbstractInstanceIdentifierT
         final EffectiveModelContext schemaContext = mock(EffectiveModelContext.class);
 
         final NormalizedNodePayload nodePayload = new NormalizedNodePayload(Inference.ofDataTreePath(schemaContext),
-            Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)).build());
+            ImmutableNodes.newContainerBuilder().withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)).build(),
+            WriterParameters.EMPTY, PrettyPrintParam.FALSE);
 
         final ByteArrayOutputStream output = new ByteArrayOutputStream();
         final XmlNormalizedNodeBodyWriter xmlWriter = new XmlNormalizedNodeBodyWriter();
@@ -48,25 +51,26 @@ public class XmlNormalizedNodeBodyWriterTest extends AbstractInstanceIdentifierT
     public void testRootContainerWrite() throws IOException {
         final NormalizedNodePayload nodePayload = new NormalizedNodePayload(
             Inference.ofDataTreePath(IID_SCHEMA),
-            Builders.containerBuilder()
+            ImmutableNodes.newContainerBuilder()
                 .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME))
-                .withChild(Builders.containerBuilder()
+                .withChild(ImmutableNodes.newContainerBuilder()
                     .withNodeIdentifier(new NodeIdentifier(
                         QName.create("foo:module", "2016-09-29", "foo-bar-container")))
                     .build())
-                .withChild(Builders.containerBuilder()
+                .withChild(ImmutableNodes.newContainerBuilder()
                     .withNodeIdentifier(new NodeIdentifier(
                         QName.create("bar:module", "2016-09-29", "foo-bar-container")))
                     .build())
-                .build());
+                .build(), WriterParameters.EMPTY, PrettyPrintParam.FALSE);
 
         final ByteArrayOutputStream output = new ByteArrayOutputStream();
         final XmlNormalizedNodeBodyWriter xmlWriter = new XmlNormalizedNodeBodyWriter();
         xmlWriter.writeTo(nodePayload, null, null, null, MediaType.APPLICATION_XML_TYPE, null, output);
 
-        assertEquals("<data xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">"
-            + "<foo-bar-container xmlns=\"bar:module\"></foo-bar-container>"
-            + "<foo-bar-container xmlns=\"foo:module\"></foo-bar-container>"
-            + "</data>", output.toString(StandardCharsets.UTF_8));
+        assertEquals("""
+            <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">\
+            <foo-bar-container xmlns="bar:module"></foo-bar-container>\
+            <foo-bar-container xmlns="foo:module"></foo-bar-container>\
+            </data>""", output.toString(StandardCharsets.UTF_8));
     }
 }
\ No newline at end of file