From 66744120793e89a9fbcbae888fc9c4bfb4d3fb6a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 25 May 2016 20:38:15 +0300 Subject: [PATCH] Rename compilerConfigurationForTests -> newConfiguration --- .../android/tests/CodegenTestsOnAndroidGenerator.java | 2 +- .../kotlin/codegen/AbstractBlackBoxCodegenTest.java | 2 +- .../AbstractCompileKotlinAgainstKotlinTest.java | 8 +++++--- .../kotlin/codegen/AbstractDumpDeclarationsTest.kt | 2 +- .../kotlin/codegen/AbstractLineNumberTest.java | 8 +++++--- .../AbstractTopLevelMembersInvocationTest.java | 6 ++++-- .../org/jetbrains/kotlin/codegen/CodegenTestCase.java | 11 +++++------ .../kotlin/jvm/compiler/AbstractLoadJavaTest.java | 9 +++++---- .../kotlin/jvm/compiler/LoadDescriptorUtil.java | 8 ++------ .../org/jetbrains/kotlin/test/KotlinTestUtils.java | 11 +++++------ .../kotlin/checkers/KotlinMultiFileTestWithJava.java | 2 +- .../kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt | 9 +++------ .../codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt | 2 +- .../kotlin/codegen/GenerateNotNullAssertionsTest.java | 4 ++-- .../org/jetbrains/kotlin/codegen/StdlibTest.java | 2 +- .../AbstractCompileJavaAgainstKotlinTest.java | 2 +- .../CompileKotlinAgainstCustomBinariesTest.java | 4 ++-- .../kotlin/jvm/compiler/KotlinClassFinderTest.kt | 2 +- .../jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt | 5 ++--- .../ResolveDescriptorsFromExternalLibraries.java | 5 ++--- .../kotlin/repl/AbstractReplInterpreterTest.kt | 4 ++-- .../org/jetbrains/kotlin/scripts/ScriptTest.java | 3 +-- .../serialization/AbstractLocalClassProtoTest.kt | 2 +- .../annotation/AbstractAnnotationProcessorBoxTest.kt | 4 +++- .../resolve/android/test/AbstractAndroidBoxTest.kt | 4 ++-- .../android/test/AbstractAndroidBytecodeShapeTest.kt | 2 +- .../AbstractAndroidSyntheticPropertyDescriptorTest.kt | 2 +- 27 files changed, 61 insertions(+), 64 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index 5a884713365..84a00e3aaed 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -157,7 +157,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { ConfigurationKind configurationKind = isFullJdkAndRuntime ? ConfigurationKind.ALL : ConfigurationKind.JDK_ONLY; TestJdkKind testJdkKind = isFullJdkAndRuntime ? TestJdkKind.FULL_JDK : TestJdkKind.MOCK_JDK; CompilerConfiguration configuration = - KotlinTestUtils.compilerConfigurationForTests(configurationKind, testJdkKind, KotlinTestUtils.getAnnotationsJar()); + KotlinTestUtils.newConfiguration(configurationKind, testJdkKind, KotlinTestUtils.getAnnotationsJar()); configuration.put(JVMConfigurationKeys.MODULE_NAME, "android-module-" + MODULE_INDEX++); if (inheritMultifileParts) { configuration.put(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, true); diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java index 12bd5b6b61e..85d7a8e1180 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java @@ -83,7 +83,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { @NotNull TestJdkKind jdkKind, @NotNull List javacOptions ) { - CompilerConfiguration configuration = createCompilerConfigurationForTests( + CompilerConfiguration configuration = createConfiguration( configurationKind, jdkKind, Collections.singletonList(getAnnotationsJar()), ArraysKt.filterNotNull(new File[] {javaSourceDir}), diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java index a9d498f4064..a0c5a963fd5 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java @@ -108,12 +108,14 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest @NotNull private ClassFileFactory compileB(@NotNull String fileName, @NotNull String content, List files) throws IOException { - CompilerConfiguration configurationWithADirInClasspath = KotlinTestUtils - .compilerConfigurationForTests(ConfigurationKind.ALL, getJdkKind(files), KotlinTestUtils.getAnnotationsJar(), aDir); + CompilerConfiguration configurationWithADirInClasspath = KotlinTestUtils.newConfiguration( + ConfigurationKind.ALL, getJdkKind(files), KotlinTestUtils.getAnnotationsJar(), aDir + ); Disposable compileDisposable = createDisposable("compileB"); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( - compileDisposable, configurationWithADirInClasspath, EnvironmentConfigFiles.JVM_CONFIG_FILES); + compileDisposable, configurationWithADirInClasspath, EnvironmentConfigFiles.JVM_CONFIG_FILES + ); return compileKotlin(fileName, content, bDir, environment, compileDisposable); } diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt index 8f55bdef574..6da068bf4db 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt @@ -40,7 +40,7 @@ abstract class AbstractDumpDeclarationsTest : CodegenTestCase() { val dumpToFile = KotlinTestUtils.tmpDirForTest(this).resolve(this.name + ".json") val configuration = - KotlinTestUtils.compilerConfigurationForTests(configurationKind, TestJdkKind.MOCK_JDK, KotlinTestUtils.getAnnotationsJar()) + KotlinTestUtils.newConfiguration(configurationKind, TestJdkKind.MOCK_JDK, KotlinTestUtils.getAnnotationsJar()) configuration.put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, dumpToFile.path) myEnvironment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index 1476ae5a3ab..83343064f7d 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -51,9 +51,11 @@ public abstract class AbstractLineNumberTest extends TestCaseWithTmpdir { private KotlinCoreEnvironment createEnvironment() { return KotlinCoreEnvironment.createForTests( myTestRootDisposable, - KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, - KotlinTestUtils.getAnnotationsJar(), tmpdir), - EnvironmentConfigFiles.JVM_CONFIG_FILES); + KotlinTestUtils.newConfiguration( + ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, KotlinTestUtils.getAnnotationsJar(), tmpdir + ), + EnvironmentConfigFiles.JVM_CONFIG_FILES + ); } @Override diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java index f4dda7aa174..27b47b0671a 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java @@ -68,8 +68,10 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte myEnvironment = KotlinCoreEnvironment.createForTests( getTestRootDisposable(), - KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, - CollectionsKt.plus(classPath, KotlinTestUtils.getAnnotationsJar()), classPath), + KotlinTestUtils.newConfiguration( + ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, + CollectionsKt.plus(classPath, KotlinTestUtils.getAnnotationsJar()), classPath + ), EnvironmentConfigFiles.JVM_CONFIG_FILES); loadFiles(ArrayUtil.toStringArray(sourceFiles)); diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 2af4e04ed77..240221c8d7e 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -72,7 +72,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*; -import static org.jetbrains.kotlin.test.KotlinTestUtils.compilerConfigurationForTests; import static org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar; public abstract class CodegenTestCase extends KtUsefulTestCase { @@ -110,7 +109,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { throw new IllegalStateException("must not set up myEnvironment twice"); } - CompilerConfiguration configuration = createCompilerConfigurationForTests( + CompilerConfiguration configuration = createConfiguration( configurationKind, TestJdkKind.MOCK_JDK, Collections.singletonList(getAnnotationsJar()), @@ -124,14 +123,14 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { } @NotNull - protected static CompilerConfiguration createCompilerConfigurationForTests( + protected static CompilerConfiguration createConfiguration( @NotNull ConfigurationKind kind, @NotNull TestJdkKind jdkKind, @NotNull List classpath, @NotNull List javaSource, @NotNull List testFilesWithConfigurationDirectives ) { - CompilerConfiguration configuration = compilerConfigurationForTests(kind, jdkKind, classpath, javaSource); + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(kind, jdkKind, classpath, javaSource); updateConfigurationByDirectivesInTestFiles(testFilesWithConfigurationDirectives, configuration); @@ -495,7 +494,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { protected void doTest(String filePath) throws Exception { File file = new File(filePath); String expectedText = KotlinTestUtils.doLoadFile(file); - final Ref javaFilesDir = Ref.create(); + Ref javaFilesDir = Ref.create(); List testFiles = createTestFiles(file, expectedText, javaFilesDir); @@ -503,7 +502,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { } @NotNull - public static List createTestFiles(File file, String expectedText, final Ref javaFilesDir) { + private static List createTestFiles(File file, String expectedText, final Ref javaFilesDir) { return KotlinTestUtils.createTestFiles(file.getName(), expectedText, new KotlinTestUtils.TestFileFactoryNoModules() { @NotNull @Override diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index 88a6661e0db..7c512e2e186 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -111,7 +111,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { File ktFile = new File(ktFileName); File txtFile = new File(ktFileName.replaceFirst("\\.kt$", ".txt")); - CompilerConfiguration configuration = compilerConfigurationForTests(configurationKind, TestJdkKind.MOCK_JDK, getAnnotationsJar()); + CompilerConfiguration configuration = newConfiguration(configurationKind, TestJdkKind.MOCK_JDK, getAnnotationsJar()); if (useTypeTableInSerializer) { configuration.put(JVMConfigurationKeys.USE_TYPE_TABLE, true); } @@ -151,7 +151,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { } }); - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, getJdkKind()); + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, getJdkKind()); ContentRootsKt.addKotlinSourceRoot(configuration, sourcesDir.getAbsolutePath()); JvmContentRootsKt.addJavaSourceRoot(configuration, new File("compiler/testData/loadJava/include")); JvmContentRootsKt.addJavaSourceRoot(configuration, tmpdir); @@ -187,8 +187,9 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( getTestRootDisposable(), - compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, getJdkKind(), getAnnotationsJar(), libraryOut), - EnvironmentConfigFiles.JVM_CONFIG_FILES); + newConfiguration(ConfigurationKind.JDK_ONLY, getJdkKind(), getAnnotationsJar(), libraryOut), + EnvironmentConfigFiles.JVM_CONFIG_FILES + ); KtFile ktFile = KotlinTestUtils.createFile(kotlinSrc.getPath(), FileUtil.loadFile(kotlinSrc, true), environment.getProject()); diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java index be0e505560b..21d1678cbbe 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java @@ -84,12 +84,8 @@ public class LoadDescriptorUtil { else { javaSourceRoots.add(javaRoot); } - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( - configurationKind, - testJdkKind, - javaBinaryRoots, - javaSourceRoots - ); + CompilerConfiguration configuration = + KotlinTestUtils.newConfiguration(configurationKind, testJdkKind, javaBinaryRoots, javaSourceRoots); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests(disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index fe2528228d2..dadf19e8a83 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -305,9 +305,8 @@ public class KotlinTestUtils { @NotNull TestJdkKind jdkKind ) { return KotlinCoreEnvironment.createForTests( - disposable, - compilerConfigurationForTests(configurationKind, jdkKind, getAnnotationsJar()), - EnvironmentConfigFiles.JVM_CONFIG_FILES); + disposable, newConfiguration(configurationKind, jdkKind, getAnnotationsJar()), EnvironmentConfigFiles.JVM_CONFIG_FILES + ); } @NotNull @@ -426,16 +425,16 @@ public class KotlinTestUtils { } @NotNull - public static CompilerConfiguration compilerConfigurationForTests( + public static CompilerConfiguration newConfiguration( @NotNull ConfigurationKind configurationKind, @NotNull TestJdkKind jdkKind, @NotNull File... extraClasspath ) { - return compilerConfigurationForTests(configurationKind, jdkKind, Arrays.asList(extraClasspath), Collections.emptyList()); + return newConfiguration(configurationKind, jdkKind, Arrays.asList(extraClasspath), Collections.emptyList()); } @NotNull - public static CompilerConfiguration compilerConfigurationForTests( + public static CompilerConfiguration newConfiguration( @NotNull ConfigurationKind configurationKind, @NotNull TestJdkKind jdkKind, @NotNull List classpath, diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java index 6e62d34fa9c..0578b93cd79 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java @@ -57,7 +57,7 @@ public abstract class KotlinMultiFileTestWithJava extends KotlinTestWithEn protected KotlinCoreEnvironment createEnvironment() throws Exception { // TODO: do not create temporary directory for tests without Java sources javaFilesDir = KotlinTestUtils.tmpDir("java-files"); - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration( getConfigurationKind(), getTestJdkKind(), CollectionsKt.plus(Collections.singletonList(KotlinTestUtils.getAnnotationsJar()), getExtraClasspath()), diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt index 6b9ec0061c8..f47340b0f90 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt @@ -174,15 +174,12 @@ class KotlinCliJavaFileManagerTest : KotlinTestWithEnvironment() { TestCase.assertNull("Should not find class in empty scope", manager.findClass("foo.Test", GlobalSearchScope.EMPTY_SCOPE)) } - @Throws(Exception::class) override fun createEnvironment(): KotlinCoreEnvironment { javaFilesDir = KotlinTestUtils.tmpDir("java-file-manager-test") - val configuration = KotlinTestUtils.compilerConfigurationForTests( - ConfigurationKind.MOCK_RUNTIME, - TestJdkKind.MOCK_JDK, - emptyList(), - listOf(javaFilesDir!!)) + val configuration = KotlinTestUtils.newConfiguration( + ConfigurationKind.MOCK_RUNTIME, TestJdkKind.MOCK_JDK, emptyList(), listOf(javaFilesDir!!) + ) return KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt index a67ebb443c9..b147b919e67 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt @@ -34,7 +34,7 @@ abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenT CodegenTestUtil.compileJava(findJavaSourcesInDirectory(directory), emptyList(), javacOptions) } - val configuration = createCompilerConfigurationForTests( + val configuration = createConfiguration( ConfigurationKind.ALL, jdkKind, /* classpath = */ listOf(KotlinTestUtils.getAnnotationsJar(), javaOutputDir), /* javaSource = */ emptyList(), diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index 98297f0c3fd..437569106cb 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -48,8 +48,8 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase { } private void setUpEnvironment(boolean disableCallAssertions, boolean disableParamAssertions, File... extraClassPath) { - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, extraClassPath); + CompilerConfiguration configuration = + KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, extraClassPath); configuration.put(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, disableCallAssertions); configuration.put(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, disableParamAssertions); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java index e62fd2d59ae..d06cfdcbfe2 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java @@ -50,7 +50,7 @@ public class StdlibTest extends KotlinTestWithEnvironment { @Override protected KotlinCoreEnvironment createEnvironment() { - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK); + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK); File junitJar = new File("libraries/lib/junit-4.11.jar"); assertTrue(junitJar.exists()); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java index d8fd51df821..3cc9e6f0e08 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java @@ -76,7 +76,7 @@ public abstract class AbstractCompileJavaAgainstKotlinTest extends TestCaseWithT KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( getTestRootDisposable(), - compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, getAnnotationsJar(), out), + newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, getAnnotationsJar(), out), EnvironmentConfigFiles.JVM_CONFIG_FILES ); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 285b0415244..c237c088f0b 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -123,8 +123,8 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { extras.addAll(extraClassPath); extras.add(KotlinTestUtils.getAnnotationsJar()); - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( - ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, extras.toArray(new File[extras.size()])); + CompilerConfiguration configuration = + KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, extras.toArray(new File[extras.size()])); return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt index 2fd24bb355c..bb4e1a09d01 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt @@ -68,7 +68,7 @@ class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() { private fun createEnvironment(tmpdir: File?): KotlinCoreEnvironment { return KotlinCoreEnvironment.createForTests( testRootDisposable, - KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir), + KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir), EnvironmentConfigFiles.JVM_CONFIG_FILES ).apply { // Activate Kotlin light class finder diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 8379d15785c..ee48cba330c 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -83,9 +83,8 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() { } private fun createEnvironment(moduleDirs: Array): KotlinCoreEnvironment { - val configuration = KotlinTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, emptyList(), moduleDirs.toList() - ) + val configuration = + KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, emptyList(), moduleDirs.toList()) return KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index 1b624b0169e..469e08f33c7 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -165,15 +165,14 @@ public class ResolveDescriptorsFromExternalLibraries { if (jar != null) { environment = KotlinCoreEnvironment.createForTests( junk, - KotlinTestUtils.compilerConfigurationForTests( + KotlinTestUtils.newConfiguration( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, KotlinTestUtils.getAnnotationsJar(), jar ), EnvironmentConfigFiles.JVM_CONFIG_FILES ); } else { - CompilerConfiguration configuration = - KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); environment = KotlinCoreEnvironment.createForTests(junk, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); if (!findRtJar().equals(jar)) { throw new RuntimeException("rt.jar mismatch: " + jar + ", " + findRtJar()); diff --git a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt index 472cdb12b58..5b859685b64 100644 --- a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt @@ -80,8 +80,8 @@ abstract class AbstractReplInterpreterTest : KtUsefulTestCase() { } protected fun doTest(path: String) { - val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) - val repl = ReplInterpreter(testRootDisposable!!, configuration, false, null) + val configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) + val repl = ReplInterpreter(testRootDisposable, configuration, false, null) for ((code, expected) in loadLines(File(path))) { val lineResult = repl.eval(code) diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java index 297f27a1cec..f8eaeb67f54 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java @@ -76,8 +76,7 @@ public class ScriptTest { Disposable rootDisposable = Disposer.newDisposable(); try { - CompilerConfiguration configuration = - KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector); ContentRootsKt.addKotlinSourceRoot(configuration, "compiler/testData/script/" + scriptPath); configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, scriptDefinition); diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index d65e13d74d6..c496b0965ce 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -52,7 +52,7 @@ abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { val clazz = classLoader.loadClass(classFile.toRelativeString(tmpdir).substringBeforeLast(".class").replace('/', '.').replace('\\', '.')) assertHasAnnotationData(clazz) - val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir) + val configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir) val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, configuration) val providerFactory = FileBasedDeclarationProviderFactory(moduleContext.storageManager, emptyList()) diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt index d0e7d33e589..d12c62f6f4c 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt @@ -77,7 +77,9 @@ abstract class AbstractAnnotationProcessorBoxTest : KotlinTestWithEnvironment() } override fun createEnvironment(): KotlinCoreEnvironment { - val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, listOf(KotlinTestUtils.getAnnotationsJar()), listOf(javaSourceRoot)) + val configuration = KotlinTestUtils.newConfiguration( + ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, listOf(KotlinTestUtils.getAnnotationsJar()), listOf(javaSourceRoot) + ) return KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) } diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt index 681d305b765..461049cfc4e 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -32,11 +32,11 @@ import java.util.regex.Pattern abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { private fun createAndroidAPIEnvironment(path: String) { - return createEnvironmentForConfiguration(KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) + return createEnvironmentForConfiguration(KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) } private fun createFakeAndroidEnvironment(path: String) { - return createEnvironmentForConfiguration(KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK), path) + return createEnvironmentForConfiguration(KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK), path) } private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) { diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt index 6c2d71cd542..16ae189e318 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.test.TestJdkKind abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTest() { private fun createAndroidAPIEnvironment(path: String) { - return createEnvironmentForConfiguration(KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) + return createEnvironmentForConfiguration(KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) } private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) { diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt index 1d1952b761d..ef962577989 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt @@ -31,7 +31,7 @@ import java.io.File abstract class AbstractAndroidSyntheticPropertyDescriptorTest : KtUsefulTestCase() { fun doTest(path: String) { - val config = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API) + val config = KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.ANDROID_API) val env = createAndroidTestEnvironment(config, getResPaths(path)) val project = env.project