Clean up JsonBodyReaderTest

Introduce useful utility methods.

Change-Id: Ie59e31f3c0d1156b341ee4c26c628f83ef8ff4bd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
index 97a9bc8ef2211434171e29fc9947d7abcdf4e28b..d85c70d87014495e6b72599960b24c3ae1f5d450 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
@@ -7,6 +7,9 @@
  */
 package org.opendaylight.restconf.nb.rfc8040;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -48,4 +51,8 @@ public abstract class AbstractInstanceIdentifierTest {
     public static final void afterClass() {
         IID_SCHEMA = null;
     }
+
+    protected static final InputStream stringInputStream(final String str) {
+        return new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
+    }
 }

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java
index 43bab86bfd1305f61d1882b125f18948d4ac0275..4ef1e7a35c934c55d775905b18013546b5150d4e 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java
@@ -13,10 +13,8 @@ import static org.junit.Assert.assertSame;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.function.Function;
 import org.eclipse.jdt.annotation.NonNull;
@@ -74,7 +72,7 @@ abstract class AbstractPatchBodyTest extends AbstractInstanceIdentifierTest {
     }
 
     final @NonNull PatchContext parse(final String uriPath, final String patchBody) throws IOException {
-        try (var body = bodyConstructor.apply(new ByteArrayInputStream(patchBody.getBytes(StandardCharsets.UTF_8)))) {
+        try (var body = bodyConstructor.apply(stringInputStream(patchBody))) {
             return body.toPatchContext(ParserIdentifier.toInstanceIdentifier(uriPath, IID_SCHEMA, mountPointService));
         }
     }

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonBodyReaderTest.java
index 88ea705eafc0bd3e206f6f60b90f431e8f6ef8ca..7dc78a28050f509458ef47e834e90c5833108d02 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonBodyReaderTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonBodyReaderTest.java
@@ -12,10 +12,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import javax.ws.rs.core.MediaType;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -149,13 +146,12 @@ public class JsonBodyReaderTest extends AbstractBodyReaderTest {
     public void testRangeViolation() throws Exception {
         mockPutBodyReader("netconf786:foo", jsonBodyReader);
 
-        final InputStream inputStream = new ByteArrayInputStream(("{\n"
-            + "  \"netconf786:foo\": {\n"
-            + "    \"bar\": 100\n"
-            + "  }\n"
-            + "}").getBytes(StandardCharsets.UTF_8));
-
-        assertRangeViolation(() -> jsonBodyReader.readFrom(null, null, null, MEDIA_TYPE, null, inputStream));
+        assertRangeViolation(() -> jsonBodyReader.readFrom(null, null, null, MEDIA_TYPE, null, stringInputStream("""
+              {
+                "netconf786:foo": {
+                  "bar": 100
+                }
+              }""")));
     }
 
     private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode,

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderTest.java
index a93f14ad89448e5d843eaa4689a5724485d8c9a3..f0571c57fe839291690534ca4693ee8aba785afd 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderTest.java
@@ -14,9 +14,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
-import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import javax.ws.rs.core.MediaType;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -268,9 +266,7 @@ public class XmlBodyReaderTest extends AbstractBodyReaderTest {
     public void testRangeViolation() throws Exception {
         mockPutBodyReader("netconf786:foo", xmlBodyReader);
 
-        final InputStream inputStream = new ByteArrayInputStream(
-            "<foo xmlns=\"netconf786\"><bar>100</bar></foo>".getBytes(StandardCharsets.UTF_8));
-
-        assertRangeViolation(() -> xmlBodyReader.readFrom(null, null, null, MEDIA_TYPE, null, inputStream));
+        assertRangeViolation(() -> xmlBodyReader.readFrom(null, null, null, MEDIA_TYPE, null,
+            stringInputStream("<foo xmlns=\"netconf786\"><bar>100</bar></foo>")));
     }
 }