import static org.junit.Assert.assertEquals;
-import com.google.common.base.Optional;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.parser.impl.util.YangModelDependencyInfo;
+@Deprecated
public class DependencyResolverTest {
@Test
public void testModulesWithoutRevisionAndImport() throws Exception {
final Map<SourceIdentifier, YangModelDependencyInfo> map = new HashMap<>();
- addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.fromInputStream(getClass().getResourceAsStream("/no-revision/imported.yang")));
- addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.fromInputStream(getClass().getResourceAsStream("/no-revision/imported@2012-12-12.yang")));
- addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.fromInputStream(getClass().getResourceAsStream("/no-revision/top@2012-10-10.yang")));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(),
+ "/no-revision/imported.yang"));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(),
+ "/no-revision/imported@2012-12-12.yang"));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(),
+ "/no-revision/top@2012-10-10.yang"));
- final DependencyResolver resolved = DependencyResolver.create(map);
+ final DependencyResolver resolved = RevisionDependencyResolver.create(map);
assertEquals(0, resolved.getUnresolvedSources().size());
assertEquals(0, resolved.getUnsatisfiedImports().size());
final Map<SourceIdentifier, YangModelDependencyInfo> map = new HashMap<>();
// Subfoo does not have parent in reactor
- addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.fromInputStream(getClass().getResourceAsStream("/model/subfoo.yang")));
- addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.fromInputStream(getClass().getResourceAsStream("/model/bar.yang")));
- addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.fromInputStream(getClass().getResourceAsStream("/model/baz.yang")));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(), "/model/subfoo.yang"));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(), "/model/bar.yang"));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(), "/model/baz.yang"));
- final DependencyResolver resolved = DependencyResolver.create(map);
+ final DependencyResolver resolved = RevisionDependencyResolver.create(map);
+ assertEquals(2, resolved.getResolvedSources().size());
assertEquals(1, resolved.getUnresolvedSources().size());
assertEquals(0, resolved.getUnsatisfiedImports().size());
}
- private void addToMap(final Map<SourceIdentifier, YangModelDependencyInfo> map, final YangModelDependencyInfo yangModelDependencyInfo) {
+ @Test
+ public void testSubmodule() throws Exception {
+ final Map<SourceIdentifier, YangModelDependencyInfo> map = new HashMap<>();
+
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(), "/model/subfoo.yang"));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(), "/model/foo.yang"));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(), "/model/bar.yang"));
+ addToMap(map, YangModelDependencyInfo.ModuleDependencyInfo.forResource(getClass(), "/model/baz.yang"));
+
+ final DependencyResolver resolved = RevisionDependencyResolver.create(map);
+ assertEquals(0, resolved.getUnresolvedSources().size());
+ assertEquals(0, resolved.getUnsatisfiedImports().size());
+ assertEquals(4, resolved.getResolvedSources().size());
+ }
+
+ private static void addToMap(final Map<SourceIdentifier, YangModelDependencyInfo> map,
+ final YangModelDependencyInfo yangModelDependencyInfo) {
map.put(getSourceId(yangModelDependencyInfo), yangModelDependencyInfo);
}
private static SourceIdentifier getSourceId(final YangModelDependencyInfo depInfo) {
final String name = depInfo.getName();
- return new SourceIdentifier(name, Optional.fromNullable(depInfo.getFormattedRevision()));
+ return RevisionSourceIdentifier.create(name, depInfo.getRevision());
}
}