Disconnect InferenceException from SourceException

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AbstractYangTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AbstractYangTest.java
index 080f0b4db0a111675f0398e0e87e292dfc607b26..b637f29733a6b049df5689a5d9c81b7bef57ce6a 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AbstractYangTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AbstractYangTest.java
@@ -21,6 +21,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.hamcrest.Matcher;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementSourceException;
 import org.opendaylight.yangtools.yang.model.ri.type.InvalidBitDefinitionException;
 import org.opendaylight.yangtools.yang.model.ri.type.InvalidEnumDefinitionException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
@@ -76,7 +77,7 @@ public abstract class AbstractYangTest {
         return assertInstanceOf(cause, actual);
     }
 
-    public static <E extends SourceException> @NonNull E assertException(final Class<E> cause,
+    public static <E extends StatementSourceException> @NonNull E assertException(final Class<E> cause,
             final Matcher<String> matcher, final String... yangResourceName) {
         final var ret = assertException(cause, yangResourceName);
         assertThat(ret.getMessage(), matcher);
@@ -90,7 +91,7 @@ public abstract class AbstractYangTest {
         return ret;
     }
 
-    public static <E extends SourceException> @NonNull E assertExceptionDir(final String yangResourceName,
+    public static <E extends StatementSourceException> @NonNull E assertExceptionDir(final String yangResourceName,
             final Class<E> cause) {
         final var ex = assertThrows(SomeModifiersUnresolvedException.class,
             () -> TestUtils.loadModules(yangResourceName));
@@ -98,7 +99,7 @@ public abstract class AbstractYangTest {
         return assertInstanceOf(cause, actual);
     }
 
-    public static <E extends SourceException> @NonNull E assertExceptionDir(final String yangResourceName,
+    public static <E extends StatementSourceException> @NonNull E assertExceptionDir(final String yangResourceName,
             final Class<E> cause, final Matcher<String> matcher) {
         final var ret = assertExceptionDir(yangResourceName, cause);
         assertThat(ret.getMessage(), matcher);