azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Customizable includeObjectMembers

Browse Source
This commit is contained in:
Andrey Breslav
2012-06-13 16:07:51 +04:00
parent 8b56d47af5
commit af3aa6133e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java
+12 -4
View File
@@ -73,7 +73,11 @@ public abstract class AbstractLazyResolveComparingTest {
Disposer.dispose(rootDisposable); Disposer.dispose(rootDisposable);
} }
protected void doTest(String testFileName, Function<Pair<ModuleDescriptor, ModuleDescriptor>, Pair<NamespaceDescriptor, NamespaceDescriptor>> transform) throws IOException { protected void doTest(
String testFileName,
Function<Pair<ModuleDescriptor, ModuleDescriptor>, Pair<NamespaceDescriptor, NamespaceDescriptor>> transform,
boolean includeMembersOfObject
) throws IOException {
ModuleDescriptor module = new ModuleDescriptor(Name.special("<test module>")); ModuleDescriptor module = new ModuleDescriptor(Name.special("<test module>"));
InjectorForTopDownAnalyzerForJvm injector = createInjectorForTDA(module); InjectorForTopDownAnalyzerForJvm injector = createInjectorForTDA(module);
@@ -105,7 +109,7 @@ public abstract class AbstractLazyResolveComparingTest {
} }
}; };
NamespaceComparator.compareNamespaces(namespacesToCompare.first, namespacesToCompare.second, NamespaceComparator.compareNamespaces(namespacesToCompare.first, namespacesToCompare.second,
true, filterJetNamespace, new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt")); includeMembersOfObject, filterJetNamespace, new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt"));
} }
private InjectorForTopDownAnalyzerForJvm createInjectorForTDA(ModuleDescriptor module) { private InjectorForTopDownAnalyzerForJvm createInjectorForTDA(ModuleDescriptor module) {
@@ -120,10 +124,14 @@ public abstract class AbstractLazyResolveComparingTest {
public Pair<NamespaceDescriptor, NamespaceDescriptor> fun(Pair<ModuleDescriptor, ModuleDescriptor> pair) { public Pair<NamespaceDescriptor, NamespaceDescriptor> fun(Pair<ModuleDescriptor, ModuleDescriptor> pair) {
return Pair.create(pair.first.getRootNamespace(), pair.second.getRootNamespace()); return Pair.create(pair.first.getRootNamespace(), pair.second.getRootNamespace());
} }
}); }, true);
} }
protected void doTestSinglePackage(String testFileName) throws Exception { protected void doTestSinglePackage(String testFileName) throws Exception {
doTestSinglePackage(testFileName, false);
}
protected void doTestSinglePackage(String testFileName, boolean includeMembersOfObject) throws Exception {
doTest(testFileName, new Function<Pair<ModuleDescriptor, ModuleDescriptor>, Pair<NamespaceDescriptor, NamespaceDescriptor>>() { doTest(testFileName, new Function<Pair<ModuleDescriptor, ModuleDescriptor>, Pair<NamespaceDescriptor, NamespaceDescriptor>>() {
@Override @Override
public Pair<NamespaceDescriptor, NamespaceDescriptor> fun(Pair<ModuleDescriptor, ModuleDescriptor> pair) { public Pair<NamespaceDescriptor, NamespaceDescriptor> fun(Pair<ModuleDescriptor, ModuleDescriptor> pair) {
@@ -133,7 +141,7 @@ public abstract class AbstractLazyResolveComparingTest {
NamespaceDescriptor expected = expectedModule.getRootNamespace().getMemberScope().getNamespace(actual.getName()); NamespaceDescriptor expected = expectedModule.getRootNamespace().getMemberScope().getNamespace(actual.getName());
return Pair.create(expected, actual); return Pair.create(expected, actual);
} }
}); }, includeMembersOfObject);
} }
private NamespaceDescriptor theOnlySubPackage(NamespaceDescriptor namespace) { private NamespaceDescriptor theOnlySubPackage(NamespaceDescriptor namespace) {