Remove RevisionSourceIdentifier

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java
index 58f85bddfd1ae49a4c65edff15f81efeaab0df6d..e84aa6b8b8d1a7c7a5aa0881ed2dc01548a9ff3c 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java
@@ -13,19 +13,18 @@ import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.text.ParseException;
 import java.util.Collection;
 import java.util.Iterator;
 import org.junit.Test;
+import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
-import org.opendaylight.yangtools.yang.stmt.TestUtils;
 
 public class YinFileImportStmtTest extends AbstractYinModulesTest {
 
     @Test
-    public void testImport() throws ParseException {
-        Module testModule = TestUtils.findModule(context, "ietf-netconf-monitoring").get();
+    public void testImport() {
+        Module testModule = context.findModules("ietf-netconf-monitoring").iterator().next();
         assertNotNull(testModule);
 
         Collection<? extends ModuleImport> imports = testModule.getImports();
@@ -34,11 +33,14 @@ public class YinFileImportStmtTest extends AbstractYinModulesTest {
         Iterator<? extends ModuleImport> importsIterator = imports.iterator();
         ModuleImport moduleImport = importsIterator.next();
 
-        assertThat(moduleImport.getModuleName(), anyOf(is("ietf-yang-types"), is("ietf-inet-types")));
+        final var nameMatch = anyOf(is(Unqualified.of("ietf-yang-types")),
+            is(Unqualified.of("ietf-inet-types")));
+
+        assertThat(moduleImport.getModuleName(), nameMatch);
         assertThat(moduleImport.getPrefix(), anyOf(is("yang"), is("inet")));
 
         moduleImport = importsIterator.next();
-        assertThat(moduleImport.getModuleName(), anyOf(is("ietf-yang-types"), is("ietf-inet-types")));
+        assertThat(moduleImport.getModuleName(), nameMatch);
         assertThat(moduleImport.getPrefix(), anyOf(is("yang"), is("inet")));
     }
 }