From d33c8638d86325d46b6d3463c6d5954788658649 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Tue, 5 Jun 2012 22:56:25 +0400 Subject: [PATCH] JetControlFlowTest doesn't need stdlib or jdk headers --- compiler/tests/org/jetbrains/jet/JetTestUtils.java | 4 ++-- compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index c81849e7507..11054bc4e2a 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -170,9 +170,9 @@ public class JetTestUtils { private JetTestUtils() { } - public static AnalyzeExhaust analyzeFile(@NotNull JetFile namespace) { + public static AnalyzeExhaust analyzeFile(@NotNull JetFile namespace, @NotNull CompilerSpecialMode compilerSpecialMode) { return AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(namespace, Collections.emptyList(), - CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true)); + CompileCompilerDependenciesTest.compilerDependenciesForTests(compilerSpecialMode, true)); } public static JetCoreEnvironment createEnvironmentWithMockJdkAndIdeaAnnotations(Disposable disposable) { diff --git a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java index faddb91de9e..4be8c3b2e88 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java @@ -56,7 +56,7 @@ public class JetControlFlowTest extends JetLiteFixture { @Override protected void setUp() throws Exception { super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.STDLIB); + createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS); } @Override @@ -73,7 +73,7 @@ public class JetControlFlowTest extends JetLiteFixture { JetFile file = loadPsiFile(myName + ".jet"); final Map data = new LinkedHashMap(); - AnalyzeExhaust analyzeExhaust = JetTestUtils.analyzeFile(file); + AnalyzeExhaust analyzeExhaust = JetTestUtils.analyzeFile(file, CompilerSpecialMode.JDK_HEADERS); List declarations = file.getDeclarations(); BindingContext bindingContext = analyzeExhaust.getBindingContext(); for (JetDeclaration declaration : declarations) {