Rename OrderedNodeContainer.getChild(int)

[yangtools.git] / yang / yang-data-codec-gson / src / test / java / org / opendaylight / yangtools / yang / data / codec / gson / Bug4501Test.java

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java
index 20a9536151a4adbd1ed9f1ccdc24edaad9665007..f3704b54b3229d8f5710efb9dc61b8852479561a 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java
@@ -8,8 +8,8 @@
 package org.opendaylight.yangtools.yang.data.codec.gson;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.loadTextFile;
 
 import com.google.common.collect.ImmutableSet;
@@ -17,46 +17,50 @@ import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URISyntaxException;
-import java.util.Optional;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug4501Test {
 
-    private static SchemaContext schemaContext;
+    private static EffectiveModelContext schemaContext;
 
     @BeforeClass
     public static void initialization() {
         schemaContext = YangParserTestUtils.parseYangResourceDirectory("/bug-4501/yang");
     }
 
+    @AfterClass
+    public static void cleanup() {
+        schemaContext = null;
+    }
+
     @Test
     public void testCorrectInput() throws IOException, URISyntaxException {
         final String inputJson = loadTextFile("/bug-4501/json/foo-correct.json");
         final NormalizedNodeResult result = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
-        final JsonParserStream jsonParser = JsonParserStream.create(streamWriter, schemaContext);
+        final JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
+            JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(schemaContext));
         jsonParser.parse(new JsonReader(new StringReader(inputJson)));
-        final NormalizedNode<?, ?> transformedInput = result.getResult();
+        final NormalizedNode transformedInput = result.getResult();
         assertTrue(transformedInput instanceof UnkeyedListNode);
 
         final UnkeyedListNode hop = (UnkeyedListNode) transformedInput;
-        final Optional<DataContainerChild<? extends PathArgument, ?>> lrsBits = hop.getChild(0).getChild(
-                NodeIdentifier.create(QName.create("foo", "1970-01-01", "lrs-bits")));
+        final DataContainerChild lrsBits = hop.childAt(0).childByArg(
+                NodeIdentifier.create(QName.create("foo", "lrs-bits")));
 
-        final ImmutableSet<String> expectedValue = ImmutableSet.of("lookup", "rloc-probe", "strict");
-        assertEquals(expectedValue, lrsBits.get().getValue());
+        assertEquals(ImmutableSet.of("lookup", "rloc-probe", "strict"), lrsBits.body());
     }
 
     @Test
@@ -64,14 +68,12 @@ public class Bug4501Test {
         final String inputJson = loadTextFile("/bug-4501/json/foo-incorrect.json");
         final NormalizedNodeResult result = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
-        final JsonParserStream jsonParser = JsonParserStream.create(streamWriter, schemaContext);
+        final JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
+            JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(schemaContext));
 
-        try {
-            jsonParser.parse(new JsonReader(new StringReader(inputJson)));
-            fail("IllegalArgumentException should be thrown.");
-        } catch (IllegalArgumentException e) {
-            assertEquals(e.getMessage(),
-                    "Node '(foo?revision=1970-01-01)lrs-bits' has already set its value to '[lookup]'");
-        }
+        final JsonReader reader = new JsonReader(new StringReader(inputJson));
+        final IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
+            () -> jsonParser.parse(reader));
+        assertEquals("Node '(foo)lrs-bits' has already set its value to '[lookup]'", ex.getMessage());
     }
 }
\ No newline at end of file