Do do not check unique in unsupported lists

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java
index 197c5846934ec6e2d1a612875fde30cb46b6bdb6..6ff3c316aa4411405160d08e4e196a39d6a163c1 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java
@@ -7,17 +7,15 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 
-public class Bug6669Test extends AbstractYangTest {
+class Bug6669Test extends AbstractYangTest {
     private static final String REV = "2016-09-08";
     private static final String FOO_NS = "foo";
     private static final String BAR_NS = "bar";
@@ -28,42 +26,39 @@ public class Bug6669Test extends AbstractYangTest {
     private static final QName M = QName.create(BAR_NS, REV, "m");
 
     @Test
-    public void testInvalidAugment() {
+    void testInvalidAugment() {
         assertInferenceExceptionDir("/bugs/bug6669/invalid/test1", startsWith(
             "An augment cannot add node 'm' because it is mandatory and in module different than target"));
     }
 
     @Test
-    public void testInvalidAugment2() {
+    void testInvalidAugment2() {
         assertInferenceExceptionDir("/bugs/bug6669/invalid/test2", startsWith(
             "An augment cannot add node 'm' because it is mandatory and in module different than target"));
     }
 
     @Test
-    public void testInvalidAugment3() {
+    void testInvalidAugment3() {
         assertInferenceExceptionDir("/bugs/bug6669/invalid/test3", startsWith(
             "An augment cannot add node 'l' because it is mandatory and in module different than target"));
     }
 
     @Test
-    public void testValidAugment() {
+    void testValidAugment() {
         final var context = assertEffectiveModelDir("/bugs/bug6669/valid/test1");
-        final SchemaNode findDataSchemaNode = context.findDataTreeChild(ROOT, BAR, BAR_1, M).get();
-        assertThat(findDataSchemaNode, instanceOf(LeafSchemaNode.class));
+        assertInstanceOf(LeafSchemaNode.class, context.findDataTreeChild(ROOT, BAR, BAR_1, M).orElseThrow());
     }
 
     @Test
-    public void testValidAugment2() {
+    void testValidAugment2() {
         final var context = assertEffectiveModelDir("/bugs/bug6669/valid/test2");
-        final SchemaNode findDataSchemaNode = context.findDataTreeChild(ROOT, BAR, BAR_1, BAR_2, M).get();
-        assertThat(findDataSchemaNode, instanceOf(LeafSchemaNode.class));
+        assertInstanceOf(LeafSchemaNode.class, context.findDataTreeChild(ROOT, BAR, BAR_1, BAR_2, M).orElseThrow());
     }
 
     @Test
-    public void testValidAugment3() throws Exception {
+    void testValidAugment3() throws Exception {
         final var context = assertEffectiveModelDir("/bugs/bug6669/valid/test3");
-        final SchemaNode findDataSchemaNode = context.findDataTreeChild(ROOT, BAR, BAR_1, BAR_2,
-                QName.create(BAR_NS, REV, "l")).get();
-        assertThat(findDataSchemaNode, instanceOf(ListSchemaNode.class));
+        assertInstanceOf(ListSchemaNode.class,
+            context.findDataTreeChild(ROOT, BAR, BAR_1, BAR_2, QName.create(BAR_NS, REV, "l")).orElseThrow());
     }
 }