Further cleanup of tests

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java
index 8f75d76d9eab9275f699a0324814b640eddd136a..70d02905cfdcec13b91973009cf0d944e03fbcdb 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java
@@ -17,18 +17,16 @@ import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.Deviation;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
-public class Bug9242Test {
+public class Bug9242Test extends AbstractYangTest {
     @Test
-    public void testDeviateReplaceWithUserDefinedTypes() throws Exception {
-        final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug9242/");
-        assertNotNull(schemaContext);
+    public void testDeviateReplaceWithUserDefinedTypes() {
+        final var schemaContext = assertEffectiveModelDir("/bugs/bug9242/");
 
         final Revision revision = Revision.of("2017-10-13");
-        final Module rootModule = schemaContext.findModule("root-module", revision).get();
-        final Module impModule = schemaContext.findModule("imp-module", revision).get();
+        final Module rootModule = schemaContext.findModule("root-module", revision).orElseThrow();
+        final Module impModule = schemaContext.findModule("imp-module", revision).orElseThrow();
 
         TypeDefinition<?> deviatedMyLeafType = null;
         TypeDefinition<?> deviatedMyLeaf2Type = null;