Port yang-parser-rfc7950 to JUnit 5

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java
index c757e41d931d3c2079d5a999be455113d0d51cff..5f9825ec85bfd98a275be4d13980e64c8442e078 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+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.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
@@ -25,9 +24,9 @@ import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement
 import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
 
-public class Bug4610Test extends AbstractYangTest {
+class Bug4610Test extends AbstractYangTest {
     @Test
-    public void test() {
+    void test() {
         final var context = assertEffectiveModelDir("/bugs/bug4610");
         final Revision revision = Revision.of("2015-12-12");
 
@@ -48,20 +47,20 @@ public class Bug4610Test extends AbstractYangTest {
 
         final SchemaTreeEffectiveStatement<?> rootContainer = context.getModuleStatement(c1Foo.getModule())
             .findSchemaTreeNode(QName.create(c1Foo, "root"), c1Foo).orElseThrow();
-        assertThat(rootContainer, instanceOf(ContainerEffectiveStatement.class));
+        assertInstanceOf(ContainerEffectiveStatement.class, rootContainer);
         assertNotEquals(g1argument, rootContainer.argument());
         assertSame(g1original, rootContainer.getDeclared());
     }
 
     private static ContainerEffectiveStatement findContainer(final EffectiveModelContext context, final QName grouping,
-            final QName container) {
+        final QName container) {
         final ModuleEffectiveStatement module = context.getModuleStatement(grouping.getModule());
         final GroupingEffectiveStatement grp = module.streamEffectiveSubstatements(GroupingEffectiveStatement.class)
             .filter(stmt -> grouping.equals(stmt.argument()))
             .findAny().orElseThrow();
 
         final SchemaTreeEffectiveStatement<?> node = grp.findSchemaTreeNode(container).orElse(null);
-        assertThat(node, instanceOf(ContainerEffectiveStatement.class));
+        assertInstanceOf(ContainerEffectiveStatement.class, node);
         return (ContainerEffectiveStatement) node;
     }
 }