diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 5fed10262e5..a8da6e1c984 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.jvm.compiler; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.generator.SimpleTestClassModel; @@ -46,9 +47,9 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { File javaFile = new File(javaFileName); File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt")); File txtFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".txt")); - NamespaceDescriptor nsa = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable); + NamespaceDescriptor nsa = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); NamespaceDescriptor nsb = compileJavaAndLoadTestNamespaceFromBinary(Collections.singletonList(javaFile), - tmpdir, myTestRootDisposable); + tmpdir, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); compareNamespaces(nsa, nsb, DONT_INCLUDE_METHODS_OF_OBJECT, txtFile); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java index 0bb47af8265..b3e3602aec8 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.jvm.compiler; import junit.framework.Test; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.TestCaseWithTmpdir; @@ -56,7 +57,7 @@ public class CompileJavaAgainstKotlinTest extends TestCaseWithTmpdir { @Override protected void runTest() throws Throwable { - compileKotlinToDirAndGetAnalyzeExhaust(ktFile, tmpdir, getTestRootDisposable()); + compileKotlinToDirAndGetAnalyzeExhaust(ktFile, tmpdir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY); List options = Arrays.asList( "-classpath", tmpdir.getPath() + System.getProperty("path.separator") + "out/production/stdlib", diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java index 292429fb9b7..ce0206778b5 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.jvm.compiler; import junit.framework.Assert; import junit.framework.Test; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; @@ -54,13 +55,13 @@ public final class LoadCompiledKotlinTest extends TestCaseWithTmpdir { @Override public void runTest() throws Exception { - AnalyzeExhaust exhaust = compileKotlinToDirAndGetAnalyzeExhaust(testFile, tmpdir, getTestRootDisposable()); + AnalyzeExhaust exhaust = compileKotlinToDirAndGetAnalyzeExhaust(testFile, tmpdir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY); NamespaceDescriptor namespaceFromSource = exhaust.getBindingContext().get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, TEST_PACKAGE_FQNAME); assert namespaceFromSource != null; Assert.assertEquals("test", namespaceFromSource.getName().getName()); - NamespaceDescriptor namespaceFromClass = LoadDescriptorUtil.loadTestNamespaceFromBinaries(tmpdir, getTestRootDisposable()); + NamespaceDescriptor namespaceFromClass = LoadDescriptorUtil.loadTestNamespaceFromBinaries(tmpdir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY); compareNamespaces(namespaceFromSource, namespaceFromClass, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT, txtFile); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 70a1ee5d81a..bb33624fd7b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -69,20 +69,22 @@ public final class LoadDescriptorUtil { public static NamespaceDescriptor compileKotlinAndLoadTestNamespaceDescriptorFromBinary( @NotNull File kotlinFile, @NotNull File outDir, - @NotNull Disposable disposable + @NotNull Disposable disposable, + @NotNull ConfigurationKind configurationKind ) throws IOException { - compileKotlinToDirAndGetAnalyzeExhaust(kotlinFile, outDir, disposable); - return loadTestNamespaceFromBinaries(outDir, disposable); + compileKotlinToDirAndGetAnalyzeExhaust(kotlinFile, outDir, disposable, configurationKind); + return loadTestNamespaceFromBinaries(outDir, disposable, ConfigurationKind.JDK_ONLY); } @NotNull public static AnalyzeExhaust compileKotlinToDirAndGetAnalyzeExhaust( @NotNull File kotlinFile, @NotNull File outDir, - @NotNull Disposable disposable + @NotNull Disposable disposable, + @NotNull ConfigurationKind configurationKind ) throws IOException { - JetFileAndExhaust fileAndExhaust = JetFileAndExhaust.createJetFileAndAnalyze(kotlinFile, disposable); + JetFileAndExhaust fileAndExhaust = JetFileAndExhaust.createJetFileAndAnalyze(kotlinFile, disposable, configurationKind); GenerationState state = GenerationUtils.compileFilesGetGenerationState(fileAndExhaust.getJetFile().getProject(), fileAndExhaust.getExhaust(), Collections.singletonList( fileAndExhaust.getJetFile())); ClassFileFactory classFileFactory = state.getFactory(); @@ -91,11 +93,11 @@ public final class LoadDescriptorUtil { } @NotNull - public static NamespaceDescriptor loadTestNamespaceFromBinaries(@NotNull File outDir, @NotNull Disposable disposable) { + public static NamespaceDescriptor loadTestNamespaceFromBinaries(@NotNull File outDir, @NotNull Disposable disposable, @NotNull ConfigurationKind configurationKind) { Disposer.dispose(disposable); CompilerConfiguration configuration = CompileCompilerDependenciesTest.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), outDir, + configurationKind, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), outDir, ForTestCompileRuntime.runtimeJarForTests()); JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(disposable, configuration); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, @@ -111,11 +113,12 @@ public final class LoadDescriptorUtil { public static NamespaceDescriptor compileJavaAndLoadTestNamespaceFromBinary( @NotNull Collection javaFiles, @NotNull File outDir, - @NotNull Disposable disposable + @NotNull Disposable disposable, + @NotNull ConfigurationKind configurationKind ) throws IOException { compileJavaWithAnnotationsJar(javaFiles, outDir); - return loadTestNamespaceFromBinaries(outDir, disposable); + return loadTestNamespaceFromBinaries(outDir, disposable, configurationKind); } private static void compileJavaWithAnnotationsJar(@NotNull Collection javaFiles, @NotNull File outDir) throws IOException { @@ -127,8 +130,8 @@ public final class LoadDescriptorUtil { } @NotNull - public static NamespaceDescriptor analyzeKotlinAndLoadTestNamespace(@NotNull File ktFile, @NotNull Disposable disposable) throws Exception { - JetFileAndExhaust fileAndExhaust = JetFileAndExhaust.createJetFileAndAnalyze(ktFile, disposable); + public static NamespaceDescriptor analyzeKotlinAndLoadTestNamespace(@NotNull File ktFile, @NotNull Disposable disposable, @NotNull ConfigurationKind configurationKind) throws Exception { + JetFileAndExhaust fileAndExhaust = JetFileAndExhaust.createJetFileAndAnalyze(ktFile, disposable, configurationKind); //noinspection ConstantConditions return fileAndExhaust.getExhaust().getBindingContext().get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, TEST_PACKAGE_FQNAME); } @@ -136,9 +139,9 @@ public final class LoadDescriptorUtil { private static class JetFileAndExhaust { @NotNull - public static JetFileAndExhaust createJetFileAndAnalyze(@NotNull File kotlinFile, @NotNull Disposable disposable) + public static JetFileAndExhaust createJetFileAndAnalyze(@NotNull File kotlinFile, @NotNull Disposable disposable, @NotNull ConfigurationKind configurationKind) throws IOException { - JetCoreEnvironment jetCoreEnvironment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable, ConfigurationKind.JDK_ONLY); + JetCoreEnvironment jetCoreEnvironment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable, configurationKind); JetFile jetFile = createFile(jetCoreEnvironment.getProject(), FileUtil.loadFile(kotlinFile, true)); AnalyzeExhaust exhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( jetFile, Collections.emptyList(), BuiltinsScopeExtensionMode.ALL); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java index f3ad69b8b35..beb7939a61f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java @@ -56,7 +56,7 @@ public final class LoadJavaCustomTest extends KotlinTestWithEnvironment { }); File expected = new File(expectedFileName); File tmpDir = JetTestUtils.tmpDir(expected.getName()); - NamespaceDescriptor javaNamespaceDescriptor = compileJavaAndLoadTestNamespaceFromBinary(files, tmpDir, getTestRootDisposable()); + NamespaceDescriptor javaNamespaceDescriptor = compileJavaAndLoadTestNamespaceFromBinary(files, tmpDir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY); //NOTE: comparing namespace to file (hack) NamespaceComparator.compareNamespaces(javaNamespaceDescriptor, javaNamespaceDescriptor, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT, expected); }