From 8111d5db9765ee917b8ca1bd9aa9990fbbe15498 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 29 Feb 2012 20:47:54 +0400 Subject: [PATCH] The +JDK option doesn't seem to make any difference any more: the tests are fast either way --- .../jetbrains/jet/checkers/JetDiagnosticsTest.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java index f4716276339..2f8ae7df208 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java @@ -26,7 +26,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.Configuration; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.psi.JetFile; @@ -112,21 +111,12 @@ public class JetDiagnosticsTest extends JetLiteFixture { } }); - boolean importJdk = expectedText.contains("+JDK"); -// Configuration configuration = importJdk ? JavaBridgeConfiguration.createJavaBridgeConfiguration(getProject()) : Configuration.EMPTY; - List jetFiles = Lists.newArrayList(); for (TestFile testFileFile : testFileFiles) { jetFiles.add(testFileFile.jetFile); } - BindingContext bindingContext; - if (importJdk) { - bindingContext = AnalyzerFacade.analyzeFilesWithJavaIntegration(getProject(), jetFiles, Predicates.alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY); - } - else { - bindingContext = AnalyzingUtils.analyzeFiles(getProject(), Configuration.EMPTY, jetFiles, Predicates.alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY); - } + BindingContext bindingContext = AnalyzerFacade.analyzeFilesWithJavaIntegration(getProject(), jetFiles, Predicates.alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY); boolean ok = true;