Port yang-parser-rfc7950 to JUnit 5

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java
index 61a66f18f88d836c59b6c50e59e97545dec9c2b1..f62e525f412c3133860c53ab8787c34b1fc5e161 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java
@@ -7,37 +7,32 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.ModuleImport;
-import org.opendaylight.yangtools.yang.model.api.Submodule;
 
-public class Bug9005Test extends AbstractYangTest {
+class Bug9005Test extends AbstractYangTest {
     @Test
-    public void test() {
-        final var context = assertEffectiveModelDir("/bugs/bug9005");
+    void test() {
+        final var foo = assertEffectiveModelDir("/bugs/bug9005").findModule("foo", Revision.of("2017-07-07"))
+            .orElseThrow();
 
-        final Module foo = context.findModule("foo", Revision.of("2017-07-07")).get();
-
-        final Collection<? extends ModuleImport> imports = foo.getImports();
+        final var imports = foo.getImports();
         assertEquals(1, imports.size());
-        final ModuleImport imp1 = imports.iterator().next();
+        final var imp1 = imports.iterator().next();
         assertEquals(Unqualified.of("bar-2"), imp1.getModuleName());
         assertEquals("bar", imp1.getPrefix());
         assertEquals(Revision.ofNullable("2000-01-02"), imp1.getRevision());
 
-        final Collection<? extends Submodule> submodules = foo.getSubmodules();
+        final var submodules = foo.getSubmodules();
         assertEquals(1, submodules.size());
-        final Submodule submodule = submodules.iterator().next();
-        final Collection<? extends ModuleImport> subImports = submodule.getImports();
+        final var submodule = submodules.iterator().next();
+        final var subImports = submodule.getImports();
 
         assertEquals(1, subImports.size());
-        final ModuleImport subImp1 = subImports.iterator().next();
+        final var subImp1 = subImports.iterator().next();
         assertEquals(Unqualified.of("bar-1"), subImp1.getModuleName());
         assertEquals("bar", subImp1.getPrefix());
         assertEquals(Revision.ofNullable("2000-01-01"), subImp1.getRevision());