diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java index 232c7ec4f7e..7b25a85323d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java @@ -71,7 +71,7 @@ public class NamespaceComparator { @NotNull Predicate includeIntoOutput, @NotNull File txtFile ) { - String serialized = new NamespaceComparator(includeObject, includeIntoOutput).doCompareNamespaces(nsa, nsb); + String serialized = assertNamespacesEqual(nsa, nsb, includeObject, includeIntoOutput); try { if (!txtFile.exists()) { FileUtil.writeToFile(txtFile, serialized); @@ -87,6 +87,13 @@ public class NamespaceComparator { } } + public static String assertNamespacesEqual(NamespaceDescriptor nsa, + NamespaceDescriptor nsb, + boolean includeObject, + Predicate includeIntoOutput) { + return new NamespaceComparator(includeObject, includeIntoOutput).doCompareNamespaces(nsa, nsb); + } + private static > List sorted(Collection items) { List r = new ArrayList(items); Collections.sort(r); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java index 61461ef2cb6..c39ec76d834 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java @@ -53,16 +53,15 @@ public class LazyResolveStdlibLoadingTest extends AbstractLazyResolveTest { Function, Pair> transform, boolean includeMembersOfObject, List files, - Predicate filterJetNamespace, - File serializeResultsTo + Predicate filterJetNamespace ) { ModuleDescriptor module = resolveEagerly(files, new JetCoreEnvironmentWithDisposable(ConfigurationKind.JDK_AND_ANNOTATIONS, false).jetCoreEnvironment); ModuleDescriptor lazyModule = resolveLazily(files, stdlibEnvironment.jetCoreEnvironment); Pair namespacesToCompare = transform.fun(Pair.create(module, lazyModule)); - NamespaceComparator.compareNamespaces(namespacesToCompare.first, namespacesToCompare.second, - includeMembersOfObject, filterJetNamespace, serializeResultsTo); + NamespaceComparator.assertNamespacesEqual(namespacesToCompare.first, namespacesToCompare.second, + includeMembersOfObject, filterJetNamespace); } public void testStdLib() throws Exception { @@ -76,14 +75,14 @@ public class LazyResolveStdlibLoadingTest extends AbstractLazyResolveTest { true, //convertToJetFiles(collectKtFiles(new File("compiler/testData/lazyResolve/namespaceComparatorWithJavaMerge"))), convertToJetFiles(collectKtFiles(STD_LIB_SRC)), - Predicates.alwaysTrue(), + Predicates.alwaysTrue() //new Predicate() { // @Override // public boolean apply(NamespaceDescriptor descriptor) { // return Name.identifier("jet").equals(descriptor.getName()); // } //}, - new File("compiler/testData/lazyResolve/namespaceComparatorWithJavaMerge/stdlib-log.txt") + //new File("compiler/testData/lazyResolve/namespaceComparatorWithJavaMerge/stdlib-log.txt") ); }