X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=codec%2Fyang-data-codec-gson%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fcodec%2Fgson%2FBug5446Test.java;h=c8ec8a2a39aa690790d9d8c390783e6fda81448d;hb=refs%2Fchanges%2F56%2F99356%2F1;hp=b1aed2332f3a7f6c931232d0934454f291487cef;hpb=e201931864746dc2312aad39571bebc612686e68;p=yangtools.git diff --git a/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java b/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java index b1aed2332f..c8ec8a2a39 100644 --- a/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java +++ b/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java @@ -64,9 +64,8 @@ public class Bug5446Test { final Writer writer = new StringWriter(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, rootNode); - final JsonParser parser = new JsonParser(); - final JsonElement serializedJson = parser.parse(jsonOutput); - final JsonElement expextedJson = parser.parse(new FileReader(new File(getClass().getResource( + final JsonElement serializedJson = JsonParser.parseString(jsonOutput); + final JsonElement expextedJson = JsonParser.parseReader(new FileReader(new File(getClass().getResource( "/bug5446/json/foo.json").toURI()), StandardCharsets.UTF_8)); assertEquals(expextedJson, serializedJson); @@ -78,10 +77,10 @@ public class Bug5446Test { final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter.createExclusiveWriter( JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(schemaContext), SchemaPath.ROOT, null, JsonWriterFactory.createJsonWriter(writer, 2)); - final NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(jsonStream); - nodeWriter.write(inputStructure); + try (NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(jsonStream)) { + nodeWriter.write(inputStructure); + } - nodeWriter.close(); return writer.toString(); }