Migrate yang-model-util to JUnit5

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

diff --git a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1414Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1414Test.java
index bb299511dd0dda8043d9e21b17d2339559a86bd0..572ab96443d3bacd510f203dfd67c35bc1d3fea6 100644 (file)
--- a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1414Test.java
+++ b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1414Test.java
@@ -7,20 +7,19 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 import org.opendaylight.yangtools.yang.model.spi.DefaultSchemaTreeInference;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class YT1414Test {
+class YT1414Test {
     private static final QName MY_CONTAINER = QName.create("uri:my-module", "2014-10-07", "my-container");
     private static final QName MY_LIST = QName.create(MY_CONTAINER, "my-list");
     private static final Absolute MY_LIST_ID = Absolute.of(MY_CONTAINER, MY_LIST);
@@ -30,19 +29,18 @@ public class YT1414Test {
     private static final Absolute BAR_FOO_ID = Absolute.of(BAR, FOO);
 
     @Test
-    public void testToFromSchemaTreeInference() {
+    void testToFromSchemaTreeInference() {
         final var stack = SchemaInferenceStack.of(
-            YangParserTestUtils.parseYangResourceDirectory("/schema-context-util"));
+                YangParserTestUtils.parseYangResourceDirectory("/schema-context-util"));
         stack.enterSchemaTree(MY_LIST_ID);
-        final var inference = stack.toSchemaTreeInference();
-        assertThat(inference, instanceOf(DefaultSchemaTreeInference.class));
+        final var inference = assertInstanceOf(DefaultSchemaTreeInference.class, stack.toSchemaTreeInference());
         assertEquals(MY_LIST_ID, inference.toSchemaNodeIdentifier());
         assertEquals(MY_LIST_ID, stack.toSchemaNodeIdentifier());
         assertEquals(MY_LIST_ID, SchemaInferenceStack.ofInference(inference).toSchemaNodeIdentifier());
     }
 
     @Test
-    public void testOfUntrustedSchemaTreeInference() {
+    void testOfUntrustedSchemaTreeInference() {
         final var context = YangParserTestUtils.parseYangResource("/yt1414.yang");
         final var foo = context.findSchemaTreeNode(Absolute.of(FOO)).orElseThrow();
         final var bar = context.findSchemaTreeNode(Absolute.of(BAR)).orElseThrow();
@@ -52,16 +50,16 @@ public class YT1414Test {
         final var correct = DefaultSchemaTreeInference.of(context, BAR_FOO_ID);
         assertEquals(List.of(bar, barFoo), correct.statementPath());
         assertEquals(correct.statementPath(),
-            SchemaInferenceStack.ofUntrusted(correct).toSchemaTreeInference().statementPath());
+                SchemaInferenceStack.ofUntrusted(correct).toSchemaTreeInference().statementPath());
 
         // Now let's try some abuse: we use 'foo' instead of 'barFoo', created unsafely ...
         final var incorrect = DefaultSchemaTreeInference.unsafeOf(context, ImmutableList.of(bar, foo));
         // ... the default non-verify method is happy to oblige ...
         assertEquals(incorrect.statementPath(),
-            SchemaInferenceStack.ofInference(incorrect).toSchemaTreeInference().statementPath());
+                SchemaInferenceStack.ofInference(incorrect).toSchemaTreeInference().statementPath());
         // ... but ofUntrusted() will reject it
         assertEquals("Provided " + incorrect + " is not consistent with resolved path " + correct,
-            assertThrows(IllegalArgumentException.class, () -> SchemaInferenceStack.ofUntrusted(incorrect))
-                .getMessage());
+                assertThrows(IllegalArgumentException.class, () -> SchemaInferenceStack.ofUntrusted(incorrect))
+                        .getMessage());
     }
 }