Introduce yangtools.binding.meta

[yangtools.git] / parser / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / stmt / Bug6183Test.java

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java
index 8414172d0b5c5e003106078cc7b6760c2fbdef2b..287432ecb2c409076ab0786ef2d009510ce28533 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java
@@ -7,17 +7,16 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 
@@ -25,12 +24,12 @@ public class Bug6183Test extends AbstractYangTest {
     private static final String FOO_NS = "foo";
 
     @Test
-    public void testYang10() {
+    void testYang10() {
         assertSchemaContext(assertEffectiveModelDir("/bugs/bug6183/yang10"));
     }
 
     @Test
-    public void testYang11() {
+    void testYang11() {
         assertSchemaContext(assertEffectiveModelDir("/bugs/bug6183/yang11"));
     }
 
@@ -39,19 +38,18 @@ public class Bug6183Test extends AbstractYangTest {
         assertEquals(1, context.getModules().size());
         assertEquals(4, context.getModules().iterator().next().getAugmentations().size());
 
-        assertTrue(context.getDataChildByName(foo("before")) instanceof ContainerSchemaNode);
-        assertTrue(context.getDataChildByName(foo("after")) instanceof ContainerSchemaNode);
+        assertInstanceOf(ContainerSchemaNode.class, context.getDataChildByName(foo("before")));
+        assertInstanceOf(ContainerSchemaNode.class, context.getDataChildByName(foo("after")));
 
-        final DataSchemaNode dataChildByName = context.getDataChildByName(foo("my-choice"));
-        assertTrue(dataChildByName instanceof ChoiceSchemaNode);
-        final ChoiceSchemaNode myChoice = (ChoiceSchemaNode) dataChildByName;
+        final var dataChildByName = context.getDataChildByName(foo("my-choice"));
+        final var myChoice = assertInstanceOf(ChoiceSchemaNode.class, dataChildByName);
 
         assertEquals(4, myChoice.getCases().size());
 
-        final CaseSchemaNode implCase = myChoice.findCase(foo("implicit-case-container")).get();
-        final CaseSchemaNode declCaseOne = myChoice.findCase(foo("declared-case-one")).get();
-        final CaseSchemaNode secondImplCase = myChoice.findCase(foo("second-implicit-case-container")).get();
-        final CaseSchemaNode declCaseTwo = myChoice.findCase(foo("declared-case-two")).get();
+        final var implCase = myChoice.findCaseNode(foo("implicit-case-container")).orElseThrow();
+        final var declCaseOne = myChoice.findCaseNode(foo("declared-case-one")).orElseThrow();
+        final var secondImplCase = myChoice.findCaseNode(foo("second-implicit-case-container")).orElseThrow();
+        final var declCaseTwo = myChoice.findCaseNode(foo("declared-case-two")).orElseThrow();
 
         assertEquals(1, declCaseOne.getChildNodes().size());
         assertFalse(getLeafSchemaNode(declCaseOne, "leaf-in-declare-case-one").isAugmenting());
@@ -60,12 +58,12 @@ public class Bug6183Test extends AbstractYangTest {
 
         assertEquals(2, implCase.getChildNodes().size());
         assertTrue(getLeafSchemaNode(implCase, "leaf-after-container").isAugmenting());
-        final ContainerSchemaNode implCaseContainer = getContainerSchemaNode(implCase, "implicit-case-container");
+        final var implCaseContainer = getContainerSchemaNode(implCase, "implicit-case-container");
 
         assertEquals(3, implCaseContainer.getChildNodes().size());
         assertTrue(getLeafSchemaNode(implCaseContainer, "leaf-inside-container").isAugmenting());
         assertFalse(getLeafSchemaNode(implCaseContainer, "declared-leaf-in-case-container").isAugmenting());
-        final ContainerSchemaNode declContInCaseCont = getContainerSchemaNode(implCaseContainer,
+        final var declContInCaseCont = getContainerSchemaNode(implCaseContainer,
                 "declared-container-in-case-container");
 
         assertEquals(1, declContInCaseCont.getChildNodes().size());
@@ -73,8 +71,7 @@ public class Bug6183Test extends AbstractYangTest {
 
         assertEquals(2, secondImplCase.getChildNodes().size());
         assertTrue(getLeafSchemaNode(secondImplCase, "leaf-after-second-container").isAugmenting());
-        final ContainerSchemaNode secondImplCaseContainer = getContainerSchemaNode(secondImplCase,
-                "second-implicit-case-container");
+        final var secondImplCaseContainer = getContainerSchemaNode(secondImplCase, "second-implicit-case-container");
 
         assertEquals(2, secondImplCaseContainer.getChildNodes().size());
         assertTrue(getLeafSchemaNode(secondImplCaseContainer, "leaf-inside-second-container").isAugmenting());
@@ -84,15 +81,11 @@ public class Bug6183Test extends AbstractYangTest {
 
     private static ContainerSchemaNode getContainerSchemaNode(final DataNodeContainer parent,
             final String containerName) {
-        final DataSchemaNode dataChildByName = parent.getDataChildByName(foo(containerName));
-        assertTrue(dataChildByName instanceof ContainerSchemaNode);
-        return (ContainerSchemaNode) dataChildByName;
+        return assertInstanceOf(ContainerSchemaNode.class, parent.getDataChildByName(foo(containerName)));
     }
 
     private static LeafSchemaNode getLeafSchemaNode(final DataNodeContainer parent, final String leafName) {
-        final DataSchemaNode dataChildByName = parent.getDataChildByName(foo(leafName));
-        assertTrue(dataChildByName instanceof LeafSchemaNode);
-        return (LeafSchemaNode) dataChildByName;
+        return assertInstanceOf(LeafSchemaNode.class, parent.getDataChildByName(foo(leafName)));
     }
 
     private static QName foo(final String localName) {