Migrate yang-data-util to JUnit5

This is mostly automated conversion, but also ditch
assertThat()/instanceOf() in favor of assertInstanceOf().

Change-Id: I4de1cb05a358cb694e2b68537179feeb08e76267
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java
index afcc48b2ab40194cf93f3546fb4095f1f78c8825..ffb5c13f6fb6e5cd8939c3208e60bfbd7241449c 100644 (file)
--- a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java
+++ b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java
@@ -7,50 +7,50 @@
  */
 package org.opendaylight.yangtools.yang.data.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Optional;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+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.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class DataSchemaContextTreeTest {
+class DataSchemaContextTreeTest {
     private static final QNameModule MODULE = QNameModule.create(XMLNamespace.of("dataschemacontext"));
     private static final QName FOO = QName.create(MODULE, "foo");
     private static final QName BAR = QName.create(MODULE, "bar");
     private static final QName BAZ = QName.create(MODULE, "baz");
     private static DataSchemaContextTree CONTEXT;
 
-    @BeforeClass
-    public static void init() {
+    @BeforeAll
+    static void init() {
         CONTEXT = DataSchemaContextTree.from(YangParserTestUtils.parseYangResource("/dataschemacontext.yang"));
     }
 
-    @AfterClass
-    public static void cleanup() {
+    @AfterAll
+    static void cleanup() {
         CONTEXT = null;
     }
 
     @Test
-    public void testCorrectInput() {
+    void testCorrectInput() {
         assertTrue(CONTEXT.findChild(YangInstanceIdentifier.of(FOO)).isPresent());
         assertTrue(CONTEXT.findChild(YangInstanceIdentifier.of(FOO).node(BAR)).isPresent());
         assertTrue(CONTEXT.findChild(YangInstanceIdentifier.of(FOO).node(BAR).node(BAZ)).isPresent());
     }
 
     @Test
-    public void testSimpleBad() {
+    void testSimpleBad() {
         assertEquals(Optional.empty(), CONTEXT.findChild(YangInstanceIdentifier.of(BAR)));
     }
 
     @Test
-    public void testNestedBad() {
+    void testNestedBad() {
         assertEquals(Optional.empty(), CONTEXT.findChild(YangInstanceIdentifier.of(BAR).node(BAZ)));
     }
 }

diff --git a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/YT1412Test.java b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/YT1412Test.java
index 82ba2943da07d86193dbf3e4c123bc62480554c1..81374bcc7b55dbeae3e65b7b6feedd99440d4c22 100644 (file)
--- a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/YT1412Test.java
+++ b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/YT1412Test.java
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.data.util;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import java.util.Set;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+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.XMLNamespace;
@@ -29,7 +28,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absol
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class YT1412Test {
+class YT1412Test {
     private static final QNameModule MODULE = QNameModule.create(XMLNamespace.of("foo"));
     private static final QName ONE = QName.create(MODULE, "one");
     private static final QName TWO = QName.create(MODULE, "two");
@@ -42,81 +41,69 @@ public class YT1412Test {
 
     private final SchemaInferenceStack stack = SchemaInferenceStack.of(CONTEXT.getEffectiveModelContext());
 
-    @BeforeClass
-    public static void init() {
+    @BeforeAll
+    static void init() {
         CONTEXT = DataSchemaContextTree.from(YangParserTestUtils.parseYangResource("/yt1412.yang"));
     }
 
-    @AfterClass
-    public static void cleanup() {
+    @AfterAll
+    static void cleanup() {
         CONTEXT = null;
     }
 
     @Test
-    public void testEnterThroughChoice() {
-        final var one = CONTEXT.getRoot().enterChild(stack, ONE);
-        assertThat(one, instanceOf(ContainerContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ContainerEffectiveStatement.class));
+    void testEnterThroughChoice() {
+        final var one = assertInstanceOf(ContainerContextNode.class, CONTEXT.getRoot().enterChild(stack, ONE));
+        assertInstanceOf(ContainerEffectiveStatement.class, stack.currentStatement());
 
-        final var two = one.enterChild(FOUR, stack);
-        assertThat(two, instanceOf(ChoiceNodeContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ChoiceEffectiveStatement.class));
+        final var two = assertInstanceOf(ChoiceNodeContextNode.class, one.enterChild(FOUR, stack));
+        assertInstanceOf(ChoiceEffectiveStatement.class, stack.currentStatement());
 
-        final var three = two.enterChild(FOUR, stack);
-        assertThat(three, instanceOf(ChoiceNodeContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ChoiceEffectiveStatement.class));
+        final var three = assertInstanceOf(ChoiceNodeContextNode.class, two.enterChild(FOUR, stack));
+        assertInstanceOf(ChoiceEffectiveStatement.class, stack.currentStatement());
 
-        final var four = three.enterChild(FOUR, stack);
-        assertThat(four, instanceOf(LeafContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(LeafEffectiveStatement.class));
+        assertInstanceOf(LeafContextNode.class, three.enterChild(FOUR, stack));
+        assertInstanceOf(LeafEffectiveStatement.class, stack.currentStatement());
 
         assertEquals(Absolute.of(ONE, TWO, THREE, THREE, FOUR, FOUR), stack.toSchemaNodeIdentifier());
     }
 
     @Test
-    public void testEnterThroughAugment() {
-        final var one = CONTEXT.getRoot().enterChild(stack, ONE);
-        assertThat(one, instanceOf(ContainerContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ContainerEffectiveStatement.class));
+    void testEnterThroughAugment() {
+        final var one = assertInstanceOf(ContainerContextNode.class, CONTEXT.getRoot().enterChild(stack, ONE));
+        assertInstanceOf(ContainerEffectiveStatement.class, stack.currentStatement());
 
-        final var augment = one.enterChild(FIVE, stack);
-        assertThat(augment, instanceOf(AugmentationContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ContainerEffectiveStatement.class));
+        final var augment = assertInstanceOf(AugmentationContextNode.class, one.enterChild(FIVE, stack));
+        assertInstanceOf(ContainerEffectiveStatement.class, stack.currentStatement());
 
-        final var five = augment.enterChild(FIVE, stack);
-        assertThat(five, instanceOf(UnkeyedListMixinContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ListEffectiveStatement.class));
+        final var five = assertInstanceOf(UnkeyedListMixinContextNode.class, augment.enterChild(FIVE, stack));
+        assertInstanceOf(ListEffectiveStatement.class, stack.currentStatement());
 
-        final var fiveItem = five.enterChild(FIVE, stack);
-        assertThat(fiveItem, instanceOf(UnkeyedListItemContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ListEffectiveStatement.class));
+        assertInstanceOf(UnkeyedListItemContextNode.class, five.enterChild(FIVE, stack));
+        assertInstanceOf(ListEffectiveStatement.class, stack.currentStatement());
 
         assertEquals(Absolute.of(ONE, FIVE), stack.toSchemaNodeIdentifier());
     }
 
     @Test
-    public void testEnterThroughAugmentChoiceAugment() {
-        final var one = CONTEXT.getRoot().enterChild(stack, ONE);
-        assertThat(one, instanceOf(ContainerContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ContainerEffectiveStatement.class));
+    void testEnterThroughAugmentChoiceAugment() {
+        final var one = assertInstanceOf(ContainerContextNode.class, CONTEXT.getRoot().enterChild(stack, ONE));
+        assertInstanceOf(ContainerEffectiveStatement.class, stack.currentStatement());
 
-        final var two = one.enterChild(SIX, stack);
-        assertThat(two, instanceOf(ChoiceNodeContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ChoiceEffectiveStatement.class));
+        final var two = assertInstanceOf(ChoiceNodeContextNode.class, one.enterChild(SIX, stack));
+        assertInstanceOf(ChoiceEffectiveStatement.class, stack.currentStatement());
 
-        final var three = two.enterChild(SIX, stack);
-        assertThat(three, instanceOf(ChoiceNodeContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(ChoiceEffectiveStatement.class));
+        final var three = assertInstanceOf(ChoiceNodeContextNode.class, two.enterChild(SIX, stack));
+        assertInstanceOf(ChoiceEffectiveStatement.class, stack.currentStatement());
 
-        final var six = three.enterChild(SIX, stack);
-        assertThat(six, instanceOf(LeafContextNode.class));
-        assertThat(stack.currentStatement(), instanceOf(LeafEffectiveStatement.class));
+        assertInstanceOf(LeafContextNode.class, three.enterChild(SIX, stack));
+        assertInstanceOf(LeafEffectiveStatement.class, stack.currentStatement());
 
         assertEquals(Absolute.of(ONE, TWO, THREE, THREE, SIX, SIX), stack.toSchemaNodeIdentifier());
     }
 
     @Test
-    public void testEnterChoicePath() {
+    void testEnterChoicePath() {
         final var result = CONTEXT.enterPath(YangInstanceIdentifier.create(
             new NodeIdentifier(ONE),
             new NodeIdentifier(TWO),
@@ -124,12 +111,12 @@ public class YT1412Test {
             new NodeIdentifier(FOUR)))
             .orElseThrow();
 
-        assertThat(result.node(), instanceOf(LeafContextNode.class));
+        assertInstanceOf(LeafContextNode.class, result.node());
         assertEquals(Absolute.of(ONE, TWO, THREE, THREE, FOUR, FOUR), result.stack().toSchemaNodeIdentifier());
     }
 
     @Test
-    public void testEnterAugmentPath() {
+    void testEnterAugmentPath() {
         final var result = CONTEXT.enterPath(YangInstanceIdentifier.create(
             new NodeIdentifier(ONE),
             new AugmentationIdentifier(Set.of(FIVE)),
@@ -137,12 +124,12 @@ public class YT1412Test {
             new NodeIdentifier(FIVE)))
             .orElseThrow();
 
-        assertThat(result.node(), instanceOf(UnkeyedListItemContextNode.class));
+        assertInstanceOf(UnkeyedListItemContextNode.class, result.node());
         assertEquals(Absolute.of(ONE, FIVE), result.stack().toSchemaNodeIdentifier());
     }
 
     @Test
-    public void testEnterAugmentChoicePath() {
+    void testEnterAugmentChoicePath() {
         final var result = CONTEXT.enterPath(YangInstanceIdentifier.create(
             new NodeIdentifier(ONE),
             new NodeIdentifier(TWO),
@@ -150,7 +137,7 @@ public class YT1412Test {
             new NodeIdentifier(SIX)))
             .orElseThrow();
 
-        assertThat(result.node(), instanceOf(LeafContextNode.class));
+        assertInstanceOf(LeafContextNode.class, result.node());
         assertEquals(Absolute.of(ONE, TWO, THREE, THREE, SIX, SIX), result.stack().toSchemaNodeIdentifier());
     }
 }

diff --git a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
index bda6262ba82943de05b3fb5222c9a8e45ae88c8b..1970476be08e21e85fba610986e8566f0e264cce 100644 (file)
--- a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
+++ b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
@@ -8,69 +8,69 @@
 package org.opendaylight.yangtools.yang.data.util.codec;
 
 import static com.google.common.base.Preconditions.checkState;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class IdentityCodecUtilTest {
+class IdentityCodecUtilTest {
     private static final QNameModule MODULE = QNameModule.create(XMLNamespace.of("yangtools846"));
     private static EffectiveModelContext SCHEMA_CONTEXT;
 
-    @BeforeClass
-    public static void init() {
+    @BeforeAll
+    static void init() {
         SCHEMA_CONTEXT = YangParserTestUtils.parseYangResource("/yangtools846.yang");
     }
 
-    @AfterClass
-    public static void cleanup() {
+    @AfterAll
+    static void cleanup() {
         SCHEMA_CONTEXT = null;
     }
 
     @Test
-    public void testCorrectInput() {
+    void testCorrectInput() {
         assertNotNull(IdentityCodecUtil.parseIdentity("yt846:foo", SCHEMA_CONTEXT,
             IdentityCodecUtilTest::resolvePrefix));
     }
 
     @Test
-    public void testNonExistent() {
+    void testNonExistent() {
         assertThrows(IllegalArgumentException.class,
             () -> IdentityCodecUtil.parseIdentity("yt846:bar", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
     @Test
-    public void testEmptyLocalName() {
+    void testEmptyLocalName() {
         assertThrows(IllegalArgumentException.class,
             () -> IdentityCodecUtil.parseIdentity("yt846:", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
     @Test
-    public void testEmptyString() {
+    void testEmptyString() {
         assertThrows(IllegalStateException.class,
             () -> IdentityCodecUtil.parseIdentity("", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
     @Test
-    public void testNoPrefix() {
+    void testNoPrefix() {
         assertThrows(IllegalStateException.class,
             () -> IdentityCodecUtil.parseIdentity("foo", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
     @Test
-    public void testEmptyPrefix() {
+    void testEmptyPrefix() {
         assertThrows(IllegalStateException.class,
             () -> IdentityCodecUtil.parseIdentity(":foo", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
     @Test
-    public void testColon() {
+    void testColon() {
         assertThrows(IllegalStateException.class,
             () -> IdentityCodecUtil.parseIdentity(":", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }