From: Robert Varga Date: Fri, 25 Sep 2020 16:30:08 +0000 (+0200) Subject: Do not rely on default charset for test resources X-Git-Tag: v6.0.0~45 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9e60badac8639af8255203b1570eb61343e487cb;p=yangtools.git Do not rely on default charset for test resources Modernizer is pointing out a fair number of improvements, implement them. Change-Id: I35d072822c215b68c9cbb196756be95271233938 Signed-off-by: Robert Varga --- diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java index a4e2bd9f6b..cf7bc529e4 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.StringReader; import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import java.util.Optional; import javax.xml.transform.dom.DOMSource; import org.junit.Test; @@ -156,8 +157,8 @@ public class AnyXmlSupportTest extends AbstractComplexJsonTest { assertTrue(data.isPresent()); final String jsonOutput = normalizedNodesToJsonString(data.get(), schemaContext, SchemaPath.ROOT); final JsonParser parser = new JsonParser(); - final JsonElement expextedJson = parser - .parse(new FileReader(new File(getClass().getResource(expectedJsonFile).toURI()))); + final JsonElement expextedJson = parser.parse(new FileReader( + new File(getClass().getResource(expectedJsonFile).toURI()), StandardCharsets.UTF_8)); final JsonElement serializedJson = parser.parse(jsonOutput); assertEquals(expextedJson, serializedJson); } diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java index bae4da9850..94b999d341 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java @@ -20,6 +20,7 @@ import java.io.StringWriter; import java.io.Writer; import java.net.URI; import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import java.util.Base64; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -68,7 +69,7 @@ public class Bug5446Test { final JsonParser parser = new JsonParser(); final JsonElement serializedJson = parser.parse(jsonOutput); final JsonElement expextedJson = parser.parse(new FileReader(new File(getClass().getResource( - "/bug5446/json/foo.json").toURI()))); + "/bug5446/json/foo.json").toURI()), StandardCharsets.UTF_8)); assertEquals(expextedJson, serializedJson); } diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug7246Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug7246Test.java index a2a413c0ef..945862c64e 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug7246Test.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug7246Test.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.net.URI; +import java.nio.charset.StandardCharsets; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -40,7 +41,8 @@ public class Bug7246Test { YangParserTestUtils.parseYangResource("/bug7246/yang/rpc-test.yang"); final JsonParser parser = new JsonParser(); final JsonElement expextedJson = parser - .parse(new FileReader(new File(getClass().getResource("/bug7246/json/expected-output.json").toURI()))); + .parse(new FileReader(new File(getClass().getResource("/bug7246/json/expected-output.json").toURI()), + StandardCharsets.UTF_8)); final DataContainerChild inputStructure = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new NodeIdentifier(qN("my-name"))) diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java index 2a9fdcb72f..9915ef856b 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import javax.xml.stream.XMLStreamReader; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -39,7 +40,7 @@ public final class TestUtils { } static String loadTextFile(final File file) throws IOException { - final FileReader fileReader = new FileReader(file); + final FileReader fileReader = new FileReader(file, StandardCharsets.UTF_8); final BufferedReader bufReader = new BufferedReader(fileReader); String line = null; diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java index 87e61654f9..4307478783 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java @@ -23,6 +23,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; @@ -108,7 +109,7 @@ public class YangModeledAnyXmlSupportTest { final JsonParser parser = new JsonParser(); final JsonElement serializedJson = parser.parse(jsonOutput); final JsonElement expextedJson = parser.parse(new FileReader(new File(getClass().getResource( - "/yang-modeled-anyxml/json/baz.json").toURI()))); + "/yang-modeled-anyxml/json/baz.json").toURI()), StandardCharsets.UTF_8)); assertEquals(expextedJson, serializedJson); }