Inline foo.xml 11/109111/1
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 28 Nov 2023 21:25:50 +0000 (22:25 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 28 Nov 2023 21:25:50 +0000 (22:25 +0100)
This is a simplistic XML fragment, inline it.

Change-Id: I817fb9f29757d5e3a23a068699667138dcedbfc2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBodyTest.java
restconf/restconf-nb/src/test/resources/foo-xml-test/foo.xml [deleted file]

index 690aa16e20d9288aeea0c221e54a7d222fdcd476..eed11fa9b399d11ef54e5f56a607c96bf1bbc5f8 100644 (file)
@@ -45,7 +45,11 @@ class XmlChildBodyTest extends AbstractBodyTest {
 
     @Test
     void postXmlTest() {
-        final var body = new XmlChildBody(XmlChildBodyTest.class.getResourceAsStream("/foo-xml-test/foo.xml"));
+        final var body = new XmlChildBody(stringInputStream("""
+            <top-level-list xmlns="foo">
+                <key-leaf>key-value</key-leaf>
+                <ordinary-leaf>leaf-value</ordinary-leaf>
+            </top-level-list>"""));
         final var payload = body.toPayload(EMPTY_PATH);
 
         final var entryId = NodeIdentifierWithPredicates.of(TOP_LEVEL_LIST,
index 3389113073b73685aa0a9a913b940e4b36cf1e91..db5d1a5011853a246a767ec1622992175d243977 100644 (file)
@@ -87,7 +87,11 @@ class XmlResourceBodyTest extends AbstractResourceBodyTest {
             .withNodeIdentifier(NodeIdentifierWithPredicates.of(TOP_LEVEL_LIST, keyName, "key-value"))
             .withChild(ImmutableNodes.leafNode(keyName, "key-value"))
             .withChild(ImmutableNodes.leafNode(QName.create(keyName, "ordinary-leaf"), "leaf-value"))
-            .build(), parseResource("foo:top-level-list=key-value", "/foo-xml-test/foo.xml"));
+            .build(), parse("foo:top-level-list=key-value", """
+                <top-level-list xmlns="foo">
+                    <key-leaf>key-value</key-leaf>
+                    <ordinary-leaf>leaf-value</ordinary-leaf>
+                </top-level-list>"""));
     }
 
     @Test
diff --git a/restconf/restconf-nb/src/test/resources/foo-xml-test/foo.xml b/restconf/restconf-nb/src/test/resources/foo-xml-test/foo.xml
deleted file mode 100644 (file)
index 96b69c4..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<top-level-list xmlns="foo">\r
-    <key-leaf>key-value</key-leaf>\r
-    <ordinary-leaf>leaf-value</ordinary-leaf>\r
-</top-level-list>
\ No newline at end of file