disable +JDK macro in JetDiagnosticsTest and fix (actually hide) revealed bugs

+JDK was not very helpful
This commit is contained in:
Stepan Koltsov
2012-03-12 22:54:24 +04:00
parent 07ff53d456
commit 3748507ac1
84 changed files with 14 additions and 95 deletions
@@ -151,8 +151,7 @@ public class JetDiagnosticsTest extends JetLiteFixture {
}
});
boolean importJdk = expectedText.contains("+JDK");
// ModuleConfiguration configuration = importJdk ? JavaBridgeConfiguration.createJavaBridgeConfiguration(getProject()) : ModuleConfiguration.EMPTY;
// ModuleConfiguration configuration = JavaBridgeConfiguration.createJavaBridgeConfiguration(getProject());
if (hasJavaFiles) {
// According to yole@ the only way to import java files is to write them on disk
// -- stepan.koltsov@ 2012-02-29
@@ -166,13 +165,7 @@ public class JetDiagnosticsTest extends JetLiteFixture {
}
}
BindingContext bindingContext;
if (importJdk) {
bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(getProject(), jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
}
else {
bindingContext = AnalyzingUtils.analyzeFiles(getProject(), ModuleConfiguration.EMPTY, jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
}
BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(getProject(), jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
boolean ok = true;