X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parser%2Fyang-parser-rfc7950%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fstmt%2FNameCollisionWithinCaseTest.java;h=a0c607a5544730f198e4d86b1f4e6095a4a8b0c2;hb=33c637e8cca6b731c2a75af4a2698f750d1e9b03;hp=9fa1ef1b87fb8295a16c9254f7eb8616ad49fc47;hpb=083ef931709258bed6e0fede5eea7fe3f63ddecc;p=yangtools.git

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java
index 9fa1ef1b87..a0c607a554 100644
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java
@@ -7,43 +7,26 @@
  */
 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.Assert.assertThrows;
 
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
-public class NameCollisionWithinCaseTest {
+public class NameCollisionWithinCaseTest extends AbstractYangTest {
     @Test
     public void testChildNameCollisionOfAugmentCase() {
-        final ReactorException ex = assertThrows(ReactorException.class,
-            () -> StmtTestUtils.parseYangSource("/bugs/name-collision-within-case/foo.yang"));
-        final Throwable cause = ex.getCause();
-        assertThat(cause, instanceOf(SourceException.class));
-        assertThat(cause.getMessage(), startsWith("Cannot add data tree child with name (foo?revision=2018-02-11)bar, "
-            + "a conflicting child already exists [at "));
+        assertSourceException(startsWith("Cannot add data tree child with name (foo?revision=2018-02-11)bar, "
+                + "a conflicting child already exists [at "), "/bugs/name-collision-within-case/foo.yang");
     }
 
     @Test
     public void testChildNameCollisionOfAugmentChoice() {
-        final ReactorException ex = assertThrows(ReactorException.class,
-            () -> StmtTestUtils.parseYangSource("/bugs/name-collision-within-case/bar.yang"));
-        final Throwable cause = ex.getCause();
-        assertThat(cause, instanceOf(SourceException.class));
-        assertThat(cause.getMessage(), startsWith("Cannot add data tree child with name (bar?revision=2018-02-11)bar, "
-            + "a conflicting child already exists [at "));
+        assertSourceException(startsWith("Cannot add data tree child with name (bar?revision=2018-02-11)bar, "
+                + "a conflicting child already exists [at "), "/bugs/name-collision-within-case/bar.yang");
     }
 
     @Test
-    public void testChildNameCollisionNormal() throws Exception {
-        final ReactorException ex = assertThrows(ReactorException.class,
-            () -> StmtTestUtils.parseYangSource("/bugs/name-collision-within-case/baz.yang"));
-        final Throwable cause = ex.getCause();
-        assertThat(cause, instanceOf(SourceException.class));
-        assertThat(cause.getMessage(), startsWith(
-            "Error in module 'baz': cannot add '(baz?revision=2018-02-28)bar'. Node name collision: "));
+    public void testChildNameCollisionNormal() {
+        assertSourceException(startsWith("Error in module 'baz': cannot add '(baz?revision=2018-02-28)bar'."
+                + " Node name collision: "), "/bugs/name-collision-within-case/baz.yang");
     }
 }