X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parser%2Fyang-parser-rfc7950%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc7950%2FBug6870Test.java;h=534fa7e4936c77a01995ff6b28ac0dde4c06be8c;hb=313717b5de9301bb690494d084b2c3a5fe3b1a9e;hp=ecdfc881f0d1b101b50046dc6a2e6c36e513395c;hpb=083ef931709258bed6e0fede5eea7fe3f63ddecc;p=yangtools.git

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java
index ecdfc881f0..534fa7e493 100644
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java
@@ -8,65 +8,48 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc7950;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.startsWith;
-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 java.util.List;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
-import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
-import org.opendaylight.yangtools.yang.stmt.StmtTestUtils;
+import org.opendaylight.yangtools.yang.stmt.AbstractYangTest;
 
-public class Bug6870Test {
+class Bug6870Test extends AbstractYangTest {
     @Test
-    public void valid11Test() throws Exception {
-        final EffectiveModelContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6870/foo.yang");
-
-        assertModifier(schemaContext, ModifierKind.INVERT_MATCH, QName.create("foo", "root"),
-            QName.create("foo", "my-leaf"));
-        assertModifier(schemaContext, null, QName.create("foo", "root"), QName.create("foo", "my-leaf-2"));
+    void valid11Test() {
+        final var context = assertEffectiveModel("/rfc7950/bug6870/foo.yang");
+        assertModifier(context, ModifierKind.INVERT_MATCH, QName.create("foo", "root"), QName.create("foo", "my-leaf"));
+        assertModifier(context, null, QName.create("foo", "root"), QName.create("foo", "my-leaf-2"));
     }
 
     private static void assertModifier(final EffectiveModelContext schemaContext,
             final ModifierKind expectedModifierKind, final QName... qnames) {
         final DataSchemaNode findNode = schemaContext.findDataTreeChild(qnames).orElseThrow();
-        assertThat(findNode, instanceOf(LeafSchemaNode.class));
-        final LeafSchemaNode myLeaf = (LeafSchemaNode) findNode;
+        final LeafSchemaNode myLeaf = assertInstanceOf(LeafSchemaNode.class, findNode);
 
-        final TypeDefinition<? extends TypeDefinition<?>> type = myLeaf.getType();
-        assertThat(type, instanceOf(StringTypeDefinition.class));
-        final List<PatternConstraint> patternConstraints = ((StringTypeDefinition) type).getPatternConstraints();
+        final var type = myLeaf.getType();
+        final var patternConstraints = assertInstanceOf(StringTypeDefinition.class, type).getPatternConstraints();
         assertEquals(1, patternConstraints.size());
         assertEquals(Optional.ofNullable(expectedModifierKind), patternConstraints.iterator().next().getModifier());
     }
 
     @Test
-    public void invalid11Test() {
-        final ReactorException ex = assertThrows(ReactorException.class,
-            () -> StmtTestUtils.parseYangSource("/rfc7950/bug6870/invalid11.yang"));
-        final Throwable cause = ex.getCause();
-        assertThat(cause, instanceOf(SourceException.class));
-        assertThat(cause.getMessage(), startsWith("'Invert-match' is not valid argument of modifier statement"));
+    void invalid11Test() {
+        assertSourceException(startsWith("'Invert-match' is not valid argument of modifier statement"),
+            "/rfc7950/bug6870/invalid11.yang");
     }
 
     @Test
-    public void invalid10Test() {
-        final ReactorException ex = assertThrows(ReactorException.class,
-            () -> StmtTestUtils.parseYangSource("/rfc7950/bug6870/invalid10.yang"));
-        final Throwable cause = ex.getCause();
-        assertThat(cause, instanceOf(SourceException.class));
-        assertThat(cause.getMessage(), startsWith("modifier is not a YANG statement or use of extension"));
+    void invalid10Test() {
+        assertSourceException(startsWith("modifier is not a YANG statement or use of extension"),
+            "/rfc7950/bug6870/invalid10.yang");
     }
-}
\ No newline at end of file
+}