X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=parser%2Fyang-parser-rfc7950%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc7950%2FActionStatementTest.java;h=ce780273cc296fc58bfb0d602d7c48dbe8d178d9;hb=33c637e8cca6b731c2a75af4a2698f750d1e9b03;hp=f42e5225c0da7d4081abbbfeba48af0778172278;hpb=c9543ea06b176ae07a205abe29fc385a7b7548ad;p=yangtools.git

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java
index f42e5225c0..ce780273cc 100644
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java
@@ -8,10 +8,9 @@
 
 package org.opendaylight.yangtools.yang.parser.stmt.rfc7950;
 
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,28 +24,26 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.stmt.StmtTestUtils;
+import org.opendaylight.yangtools.yang.stmt.AbstractYangTest;
 
-public class ActionStatementTest {
+public class ActionStatementTest extends AbstractYangTest {
 
     private static final String FOO_NS = "foo-namespace";
     private static final String FOO_REV = "2016-12-13";
 
     @Test
     public void testActionStatementInDataContainers() throws Exception {
-        final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foo.yang");
-        assertNotNull(schemaContext);
+        final var context = assertEffectiveModel("/rfc7950/action-stmt/foo.yang");
 
-        assertContainsActions(schemaContext, "root", "grp-action", "aug-action");
-        assertContainsActions(schemaContext, "top-list", "top-list-action");
-        assertContainsActions(schemaContext, "top", "top-action");
+        assertContainsActions(context, "root", "grp-action", "aug-action");
+        assertContainsActions(context, "top-list", "top-list-action");
+        assertContainsActions(context, "top", "top-action");
 
-        final Collection<? extends GroupingDefinition> groupings = schemaContext.getGroupings();
+        final Collection<? extends GroupingDefinition> groupings = context.getGroupings();
         assertEquals(1, groupings.size());
         assertContainsActions(groupings.iterator().next(), "grp-action");
 
-        final Collection<? extends Module> modules = schemaContext.getModules();
+        final Collection<? extends Module> modules = context.getModules();
         assertEquals(1, modules.size());
         final Module foo = modules.iterator().next();
         final Collection<? extends AugmentationSchemaNode> augmentations = foo.getAugmentations();
@@ -76,58 +73,32 @@ public class ActionStatementTest {
     }
 
     @Test
-    public void testActionUnsupportedInYang10() throws Exception {
-        try {
-            StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foo10.yang");
-            fail("Test should fail due to invalid Yang 1.0");
-        } catch (final ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith("action is not a YANG statement or use of extension"));
-        }
+    public void testActionUnsupportedInYang10() {
+        assertSourceException(startsWith("action is not a YANG statement or use of extension"),
+                "/rfc7950/action-stmt/foo10.yang");
     }
 
     @Test
-    public void testActionWithinIllegalAncestor() throws Exception {
-        try {
-            StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foo-invalid.yang");
-            fail("Test should fail due to invalid Yang 1.1");
-        } catch (final ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith("Action (foo-namespace?revision=2016-12-13)"
-                    + "action-in-grouping is defined within a notification, rpc or another action"));
-        }
+    public void testActionWithinIllegalAncestor() {
+        assertSourceException(startsWith("Action (foo-namespace?revision=2016-12-13)action-in-grouping is defined"
+                + " within a notification, rpc or another action"), "/rfc7950/action-stmt/foo-invalid.yang");
     }
 
     @Test
-    public void testActionWithinListWithoutKey() throws Exception {
-        try {
-            StmtTestUtils.parseYangSource("/rfc7950/action-stmt/bar-invalid.yang");
-            fail("Test should fail due to invalid Yang 1.1");
-        } catch (final ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith(
-                    "Action (bar-namespace?revision=2016-12-13)my-action is defined within a list"
-                            + " that has no key statement"));
-        }
+    public void testActionWithinListWithoutKey() {
+        assertSourceException(startsWith("Action (bar-namespace?revision=2016-12-13)my-action is defined within a list"
+                + " that has no key statement"), "/rfc7950/action-stmt/bar-invalid.yang");
     }
 
     @Test
-    public void testActionInUsedGroupingWithinCase() throws Exception {
-        try {
-            StmtTestUtils.parseYangSource("/rfc7950/action-stmt/baz-invalid.yang");
-            fail("Test should fail due to invalid Yang 1.1");
-        } catch (final ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith(
-                    "Action (baz-namespace?revision=2016-12-13)action-in-grouping is defined within a "
-                            + "case statement"));
-        }
+    public void testActionInUsedGroupingWithinCase() {
+        assertSourceException(startsWith("Action (baz-namespace?revision=2016-12-13)action-in-grouping"
+                + " is defined within a case statement"), "/rfc7950/action-stmt/baz-invalid.yang");
     }
 
     @Test
-    public void testActionInUsedGroupingAtTopLevelOfModule() throws Exception {
-        try {
-            StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foobar-invalid.yang");
-            fail("Test should fail due to invalid Yang 1.1");
-        } catch (final ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith(
-                    "Action (foobar-namespace?revision=2016-12-13)my-action is defined at the top level of a module"));
-        }
+    public void testActionInUsedGroupingAtTopLevelOfModule() {
+        assertSourceException(startsWith("Action (foobar-namespace?revision=2016-12-13)my-action is defined"
+                + " at the top level of a module"), "/rfc7950/action-stmt/foobar-invalid.yang");
     }
 }