Revert "Unify ORv1 and IIv5"

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1383Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1383Test.java
index 0ab2824d840b6b23bd89ea3417d70f467cee99d4..435788a78a53216f5cd20756ce06da8e96f35629 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1383Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1383Test.java
@@ -7,21 +7,20 @@
  */
 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.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.model.api.stmt.CaseEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement;
 
-public class YT1383Test extends AbstractYangTest {
+class YT1383Test extends AbstractYangTest {
     @Test
-    public void testDeclaredImplicitCase() {
+    void testDeclaredImplicitCase() {
         final var foo = assertEffectiveModel("/bugs/YT1383/foo.yang").getModuleStatements().values().iterator()
             .next().findFirstEffectiveSubstatement(ChoiceEffectiveStatement.class).orElseThrow();
 
@@ -29,10 +28,10 @@ public class YT1383Test extends AbstractYangTest {
         final var effStatements = foo.effectiveSubstatements();
         assertEquals(2, effStatements.size());
         final var bar = effStatements.get(0);
-        assertThat(bar, instanceOf(CaseEffectiveStatement.class));
+        assertInstanceOf(CaseEffectiveStatement.class, bar);
         assertNotNull(bar.getDeclared());
         final var baz = effStatements.get(1);
-        assertThat(baz, instanceOf(CaseEffectiveStatement.class));
+        assertInstanceOf(CaseEffectiveStatement.class, baz);
         assertNull(baz.getDeclared());
 
         // Declared view of things
@@ -41,8 +40,8 @@ public class YT1383Test extends AbstractYangTest {
         final var declStatements = fooDecl.declaredSubstatements();
         assertEquals(2, declStatements.size());
         final var barDecl = declStatements.get(0);
-        assertThat(barDecl, instanceOf(CaseStatement.class));
+        assertInstanceOf(CaseStatement.class, barDecl);
         final var bazDecl = declStatements.get(1);
-        assertThat(bazDecl, instanceOf(ContainerStatement.class));
+        assertInstanceOf(ContainerStatement.class, bazDecl);
     }
 }