Migrate yang-model-util to JUnit5

[yangtools.git] / model / yang-model-util / src / test / java / org / opendaylight / yangtools / yang / model / util / YT1233Test.java

diff --git a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java
index 080886789ba9ad8179ff625c59926be376bac1c4..301dbaf4e5a8a111a449bc5e0c70b90ebcd26fc9 100644 (file)
--- a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java
+++ b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java
@@ -9,56 +9,54 @@ package org.opendaylight.yangtools.yang.model.util;
 
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.NoSuchElementException;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class YT1233Test {
+class YT1233Test {
     private static EffectiveModelContext context;
 
     private final SchemaInferenceStack stack = SchemaInferenceStack.of(context);
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
         context = YangParserTestUtils.parseYangResource("/yt1233.yang");
     }
 
     @Test
-    public void testExitToDataTree() {
-        final DataTreeEffectiveStatement<?> foo = stack.enterDataTree(QName.create("foo", "foo"));
+    void testExitToDataTree() {
+        final var foo = stack.enterDataTree(QName.create("foo", "foo"));
         assertSame(foo, stack.exitToDataTree());
         assertTrue(stack.isEmpty());
         assertSame(foo, stack.enterDataTree(foo.argument()));
     }
 
     @Test
-    public void testExitToGrouping() {
-        final GroupingEffectiveStatement baz = stack.enterGrouping(QName.create("foo", "baz"));
+    void testExitToGrouping() {
+        final var baz = stack.enterGrouping(QName.create("foo", "baz"));
         assertTrue(stack.inGrouping());
-        final DataTreeEffectiveStatement<?> xyzzy = stack.enterDataTree(QName.create("foo", "xyzzy"));
+        final var xyzzy = stack.enterDataTree(QName.create("foo", "xyzzy"));
         assertSame(xyzzy, stack.exitToDataTree());
         assertSame(baz, stack.currentStatement());
         assertSame(xyzzy, stack.enterDataTree(xyzzy.argument()));
     }
 
     @Test
-    public void testEmptyExitToDataTree() {
+    void testEmptyExitToDataTree() {
         assertThrows(NoSuchElementException.class, stack::exitToDataTree);
     }
 
     @Test
-    public void testSchemaExitToDataTree() {
+    void testSchemaExitToDataTree() {
         stack.enterSchemaTree(QName.create("foo", "bar"));
-        final IllegalStateException ex = assertThrows(IllegalStateException.class, stack::exitToDataTree);
+        final var ex = assertThrows(IllegalStateException.class, stack::exitToDataTree);
         assertThat(ex.getMessage(), startsWith("Unexpected current "));
     }
 }