diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java index 5740dc4c199..eec1f17a32a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -17,10 +17,8 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.google.common.base.Predicate; -import com.google.common.base.Predicates; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.psi.PsiFile; import com.intellij.util.Function; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.cli.jvm.compiler.NamespaceComparator; @@ -30,8 +28,6 @@ import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.name.Name; import java.io.File; @@ -59,11 +55,7 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends Abstract } }); - ModuleDescriptor eagerModuleForLazy = new ModuleDescriptor(Name.special("")); - - InjectorForTopDownAnalyzerForJvm tdaInjectorForLazy = createInjectorForTDA(eagerModuleForLazy); - // This line is required fro the 'jet' namespace to be filled in with functions - tdaInjectorForLazy.getTopDownAnalyzer().analyzeFiles(Collections.singletonList(JetPsiFactory.createFile(project, "")), Collections.emptyList()); + InjectorForTopDownAnalyzerForJvm tdaInjectorForLazy = getEagerInjectorForTopDownAnalyzer(); ModuleDescriptor lazyModule = new ModuleDescriptor(Name.special("")); ResolveSession session = new ResolveSession(project, lazyModule, tdaInjectorForLazy.getJavaBridgeConfiguration(), new FileBasedDeclarationProviderFactory(files)); @@ -82,12 +74,6 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends Abstract includeMembersOfObject, filterJetNamespace, new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt")); } - private InjectorForTopDownAnalyzerForJvm createInjectorForTDA(ModuleDescriptor module) { - TopDownAnalysisParameters params = new TopDownAnalysisParameters( - Predicates.alwaysTrue(), false, false, Collections.emptyList()); - return new InjectorForTopDownAnalyzerForJvm(project, params, new BindingTraceContext(), module, compilerDependencies); - } - protected void doTest(String testFileName) throws Exception { doTest(testFileName, new Function, Pair>() { @Override diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java index ef0e095532b..e5808c00175 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java @@ -16,16 +16,27 @@ package org.jetbrains.jet.lang.resolve.lazy; +import com.google.common.base.Predicates; import com.intellij.openapi.Disposable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; +import com.intellij.psi.PsiFile; import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; +import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; +import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; +import org.jetbrains.jet.lang.resolve.name.Name; import org.junit.After; import org.junit.BeforeClass; +import java.util.Collections; + /** * @author abreslav */ @@ -51,4 +62,20 @@ public class AbstractLazyResolveTest { Disposer.dispose(rootDisposable); } + protected InjectorForTopDownAnalyzerForJvm getEagerInjectorForTopDownAnalyzer() { + ModuleDescriptor eagerModuleForLazy = new ModuleDescriptor(Name.special("")); + + InjectorForTopDownAnalyzerForJvm tdaInjectorForLazy = createInjectorForTDA(eagerModuleForLazy); + // This line is required fro the 'jet' namespace to be filled in with functions + tdaInjectorForLazy.getTopDownAnalyzer().analyzeFiles( + Collections.singletonList(JetPsiFactory.createFile(project, "")), Collections.emptyList()); + return tdaInjectorForLazy; + } + + protected InjectorForTopDownAnalyzerForJvm createInjectorForTDA(ModuleDescriptor module) { + TopDownAnalysisParameters params = new TopDownAnalysisParameters( + Predicates.alwaysTrue(), false, false, Collections.emptyList()); + return new InjectorForTopDownAnalyzerForJvm(project, params, new BindingTraceContext(), module, compilerDependencies); + } + }