From a7b50d7d06dfe8fca3bc8b488a92a7336205fd33 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 20 Nov 2013 15:19:00 +0400 Subject: [PATCH] Remove rependency on annotations-ext.jar --- .../org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java | 2 +- .../org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java | 3 +-- .../lazy/AbstractLazyResolveNamespaceComparingTest.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 276fae80430..cc3393c038e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -66,7 +66,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { File javaFile = new File(javaFileName); File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt")); File txtFile = getTxtFile(javaFile.getPath()); - NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); + NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable, ConfigurationKind.ALL); Pair javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary( Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.ALL); checkLoadedNamespaces(txtFile, kotlinNamespace, javaNamespaceAndContext.first, javaNamespaceAndContext.second); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 85ee9dd864b..c4fcb844bbf 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -119,8 +119,7 @@ public final class LoadDescriptorUtil { private static void compileJavaWithAnnotationsJar(@NotNull Collection javaFiles, @NotNull File outDir) throws IOException { String classPath = "out/production/runtime" + - File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath() + - File.pathSeparator + JetTestUtils.getAnnotationsExtJar().getPath(); + File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath(); JetTestUtils.compileJavaFiles(javaFiles, Arrays.asList( "-classpath", classPath, "-sourcepath", "compiler/tests", // for @ExpectLoadError annotation 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 ebf37cd77f7..7cabbca082f 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -43,7 +43,7 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe @Override protected JetCoreEnvironment createEnvironment() { - return createEnvironmentWithMockJdk(ConfigurationKind.JDK_AND_ANNOTATIONS); + return createEnvironmentWithMockJdk(ConfigurationKind.ALL); } protected void doTestCheckingPrimaryConstructors(String testFileName) throws IOException {