From 50bc94bafc0679181ad00be557152771d967e327 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 18 Feb 2013 20:15:05 +0400 Subject: [PATCH] Not compiling @ExpectLoadError annotation all the time. --- .../jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java | 2 +- .../jet/jvm/compiler/ExpectedLoadErrorsUtil.java | 1 - .../jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java | 8 ++++++-- .../jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java | 1 - 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 4526a6f768c..01747aa5efc 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -46,7 +46,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { File txtFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".txt")); NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); Pair javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary( - Arrays.asList(javaFile, ExpectedLoadErrorsUtil.ANNOTATION_SOURCE_FILE), + Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); checkLoadedNamespaces(txtFile, kotlinNamespace, javaNamespaceAndContext); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java index 31f96a92abb..85f5bf952f8 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -36,7 +36,6 @@ import static com.intellij.testFramework.UsefulTestCase.assertSameElements; public class ExpectedLoadErrorsUtil { public static final String ANNOTATION_CLASS_NAME = ExpectLoadError.class.getName(); - public static final File ANNOTATION_SOURCE_FILE = new File("compiler/tests/" + ANNOTATION_CLASS_NAME.replace('.', '/') + ".java"); public static void checkForLoadErrors( @NotNull NamespaceDescriptor namespaceFromJava, diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 214f3dd136e..b22fc2748fb 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -94,8 +94,11 @@ public final class LoadDescriptorUtil { Disposer.dispose(disposable); CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( - configurationKind, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), outDir, - ForTestCompileRuntime.runtimeJarForTests()); + configurationKind, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), + outDir, + ForTestCompileRuntime.runtimeJarForTests(), + new File("compiler/tests") // for @ExpectLoadError annotation + ); JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(disposable, configuration); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(jetCoreEnvironment.getProject()); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); @@ -121,6 +124,7 @@ public final class LoadDescriptorUtil { String classPath = "out/production/runtime" + File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath(); JetTestUtils.compileJavaFiles(javaFiles, Arrays.asList( "-classpath", classPath, + "-sourcepath", "compiler/tests", // for @ExpectLoadError annotation "-d", outDir.getPath() )); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java index 38f1eedbad7..83a19d04450 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java @@ -71,7 +71,6 @@ public final class LoadJavaCustomTest extends KotlinTestWithEnvironment { return new File(s); } }); - files.add(ExpectedLoadErrorsUtil.ANNOTATION_SOURCE_FILE); File expectedFile = new File(expectedFileName); File tmpDir = JetTestUtils.tmpDir(expectedFile.getName());