Eliminate ModuleIdentifier

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / Bug6961Test.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java
index 15b6829219003f0c667588b8431f13741289396c..779711da765ebc1eb9abf11e8a4440462941f8d3 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6961Test.java
@@ -16,9 +16,9 @@ import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.util.ModuleIdentifierImpl;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
+import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
 import org.opendaylight.yangtools.yang.model.util.SimpleSchemaContext;
 
@@ -27,21 +27,21 @@ public class Bug6961Test {
     @Test
     public void testBug6961SchemaContext() throws Exception {
         final Optional<Revision> revision = Revision.ofNullable("2016-01-01");
-        final ModuleIdentifier foo = ModuleIdentifierImpl.create("foo", revision);
-        final ModuleIdentifier sub1Foo = ModuleIdentifierImpl.create("sub1-foo", revision);
-        final ModuleIdentifier sub2Foo = ModuleIdentifierImpl.create("sub2-foo", revision);
-        final ModuleIdentifier bar = ModuleIdentifierImpl.create("bar", revision);
-        final ModuleIdentifier sub1Bar = ModuleIdentifierImpl.create("sub1-bar", revision);
-        final ModuleIdentifier baz = ModuleIdentifierImpl.create("baz", revision);
-        final Set<ModuleIdentifier> testSet = ImmutableSet.of(foo, sub1Foo, sub2Foo, bar, sub1Bar, baz);
+        final SourceIdentifier foo = RevisionSourceIdentifier.create("foo", revision);
+        final SourceIdentifier sub1Foo = RevisionSourceIdentifier.create("sub1-foo", revision);
+        final SourceIdentifier sub2Foo = RevisionSourceIdentifier.create("sub2-foo", revision);
+        final SourceIdentifier bar = RevisionSourceIdentifier.create("bar", revision);
+        final SourceIdentifier sub1Bar = RevisionSourceIdentifier.create("sub1-bar", revision);
+        final SourceIdentifier baz = RevisionSourceIdentifier.create("baz", revision);
+        final Set<SourceIdentifier> testSet = ImmutableSet.of(foo, sub1Foo, sub2Foo, bar, sub1Bar, baz);
         final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6961/");
         assertNotNull(context);
-        final Set<ModuleIdentifier> allModuleIdentifiers = SchemaContextUtil.getConstituentModuleIdentifiers(context);
+        final Set<SourceIdentifier> allModuleIdentifiers = SchemaContextUtil.getConstituentModuleIdentifiers(context);
         assertNotNull(allModuleIdentifiers);
         assertEquals(6, allModuleIdentifiers.size());
         final SchemaContext schemaContext = SimpleSchemaContext.forModules(context.getModules());
         assertNotNull(schemaContext);
-        final Set<ModuleIdentifier> allModuleIdentifiersResolved = SchemaContextUtil.getConstituentModuleIdentifiers(
+        final Set<SourceIdentifier> allModuleIdentifiersResolved = SchemaContextUtil.getConstituentModuleIdentifiers(
             schemaContext);
         assertNotNull(allModuleIdentifiersResolved);
         assertEquals(6, allModuleIdentifiersResolved.size());