Port yang-parser-rfc7950 to JUnit 5

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java
index 4cba325213031d350e04c8cbfbd31430ddb3c03e..637696b935577717c417a97bd925fe3f2680f0bc 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java
@@ -7,36 +7,35 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.LeafEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
 
-public class Bug6972Test extends AbstractYangTest {
+class Bug6972Test extends AbstractYangTest {
     @Test
-    public void allUnitsShouldBeTheSameInstance() {
+    void allUnitsShouldBeTheSameInstance() {
         final var schemaContext = assertEffectiveModelDir("/bugs/bug6972");
         assertEquals(3, schemaContext.getModules().size());
 
         final Revision revision = Revision.of("2016-10-20");
-        final Module foo = schemaContext.findModule("foo", revision).get();
-        final Module bar = schemaContext.findModule("bar", revision).get();
-        final Module baz = schemaContext.findModule("baz", revision).get();
+        final var foo = schemaContext.findModule("foo", revision).orElseThrow();
+        final var bar = schemaContext.findModule("bar", revision).orElseThrow();
+        final var baz = schemaContext.findModule("baz", revision).orElseThrow();
 
         final QName barExportCont = QName.create("bar-ns", "bar-export", revision);
         final QName barFooCont = QName.create("bar-ns", "bar-foo", revision);
         final QName barFooLeaf = QName.create("bar-ns", "foo", revision);
 
-        final UnitsEffectiveStatement unitsBar1 = getEffectiveUnits(bar, barExportCont, barFooLeaf);
+        final var unitsBar1 = getEffectiveUnits(bar, barExportCont, barFooLeaf);
         assertSame(unitsBar1, getEffectiveUnits(bar, barFooCont, barFooLeaf));
 
         final QName bazExportCont = QName.create("baz-ns", "baz-export", revision);
@@ -49,20 +48,13 @@ public class Bug6972Test extends AbstractYangTest {
 
     private static UnitsEffectiveStatement getEffectiveUnits(final Module module, final QName containerQName,
             final QName leafQName) {
-        UnitsEffectiveStatement units = null;
-
-        final ContainerSchemaNode cont = (ContainerSchemaNode) module.getDataChildByName(containerQName);
+        final var cont = (ContainerSchemaNode) module.getDataChildByName(containerQName);
         assertNotNull(cont);
-        final LeafSchemaNode leaf = (LeafSchemaNode) cont.getDataChildByName(leafQName);
+        final var leaf = (LeafSchemaNode) cont.getDataChildByName(leafQName);
         assertNotNull(leaf);
 
-        for (EffectiveStatement<?, ?> effStmt : ((LeafEffectiveStatement) leaf).effectiveSubstatements()) {
-            if (effStmt instanceof UnitsEffectiveStatement) {
-                units = (UnitsEffectiveStatement) effStmt;
-                break;
-            }
-        }
-
-        return units;
+        return ((LeafEffectiveStatement) leaf).streamEffectiveSubstatements(UnitsEffectiveStatement.class)
+            .findFirst()
+            .orElse(null);
     }
 }
\ No newline at end of file