From: Robert Varga Date: Tue, 10 May 2022 18:08:49 +0000 (+0200) Subject: Use text blocks in YangInstanceIdentifierWriterTest X-Git-Tag: v9.0.0~77 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=1c4c8d10983f94378da03c94ca08653f7c184a62 Use text blocks in YangInstanceIdentifierWriterTest We have JDK17, we can use text blocks for multiline strings. Change-Id: I0b130fcd183ecd3d3b8ddf1fdb9862847af92244 Signed-off-by: Robert Varga --- diff --git a/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/YangInstanceIdentifierWriterTest.java b/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/YangInstanceIdentifierWriterTest.java index ae7371a64b..a4fa881de8 100644 --- a/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/YangInstanceIdentifierWriterTest.java +++ b/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/stream/YangInstanceIdentifierWriterTest.java @@ -66,17 +66,19 @@ public class YangInstanceIdentifierWriterTest { } } - assertEquals("(test)container-1(container)\n" - + " (test)container-2(container)\n" - + " (test)container-3(container)\n" - + " (test)payload-container(container)\n" - + " (test)payload-leaf(leaf)\n" - + " (String)=leaf-value\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + "(end)\n", streamWriter.result()); + assertEquals(""" + (test)container-1(container) + (test)container-2(container) + (test)container-3(container) + (test)payload-container(container) + (test)payload-leaf(leaf) + (String)=leaf-value + (end) + (end) + (end) + (end) + (end) + """, streamWriter.result()); } @Test @@ -115,19 +117,21 @@ public class YangInstanceIdentifierWriterTest { } } - assertEquals("(test)container-1(container)\n" - + " AugmentationIdentifier{childNames=[(augment-namespace)augmented-container]}(augmentation)\n" - + " (augment-namespace)augmented-container(container)\n" - + " (augment-namespace)container-2(container)\n" - + " (test)payload-container(container)\n" - + " (test)payload-leaf(leaf)\n" - + " (String)=leaf-value\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + "(end)\n", streamWriter.result()); + assertEquals(""" + (test)container-1(container) + AugmentationIdentifier{childNames=[(augment-namespace)augmented-container]}(augmentation) + (augment-namespace)augmented-container(container) + (augment-namespace)container-2(container) + (test)payload-container(container) + (test)payload-leaf(leaf) + (String)=leaf-value + (end) + (end) + (end) + (end) + (end) + (end) + """, streamWriter.result()); } @Test @@ -162,17 +166,19 @@ public class YangInstanceIdentifierWriterTest { } } - assertEquals("(test)list-1(key)\n" - + " (test)list-1[{(test)list-1-key=test-list-entry}][](key)\n" - + " (test)container-1(container)\n" - + " (test)payload-container(container)\n" - + " (test)payload-leaf(leaf)\n" - + " (String)=leaf-value\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + "(end)\n", streamWriter.result()); + assertEquals(""" + (test)list-1(key) + (test)list-1[{(test)list-1-key=test-list-entry}][](key) + (test)container-1(container) + (test)payload-container(container) + (test)payload-leaf(leaf) + (String)=leaf-value + (end) + (end) + (end) + (end) + (end) + """, streamWriter.result()); } @Test @@ -202,15 +208,17 @@ public class YangInstanceIdentifierWriterTest { } } - assertEquals("(test)choice-node(choice)\n" - + " (test)container-in-case(container)\n" - + " (test)payload-container(container)\n" - + " (test)payload-leaf(leaf)\n" - + " (String)=leaf-value\n" - + " (end)\n" - + " (end)\n" - + " (end)\n" - + "(end)\n", streamWriter.result()); + assertEquals(""" + (test)choice-node(choice) + (test)container-in-case(container) + (test)payload-container(container) + (test)payload-leaf(leaf) + (String)=leaf-value + (end) + (end) + (end) + (end) + """, streamWriter.result()); } @Test @@ -242,14 +250,16 @@ public class YangInstanceIdentifierWriterTest { } } - assertEquals("(test)list-list(leaf-list)\n" - + " (test)leaf(entry)\n" - + " (String)=test-value\n" - + " (end)\n" - + " (test)leaf(entry)\n" - + " (String)=test-value-2\n" - + " (end)\n" - + "(end)\n", streamWriter.result()); + assertEquals(""" + (test)list-list(leaf-list) + (test)leaf(entry) + (String)=test-value + (end) + (test)leaf(entry) + (String)=test-value-2 + (end) + (end) + """, streamWriter.result()); } private static NormalizedNode mockedPayload() { @@ -263,4 +273,4 @@ public class YangInstanceIdentifierWriterTest { return containerNode; } -} \ No newline at end of file +}