azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate all JDK 9 related tests to JDK 11

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-09-22 17:21:53 +03:00
committed by TeamCityServer
parent ce3562f0e8
commit de7fb9606a
92 changed files with 284 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -5
View File
@@ -190,9 +190,6 @@ public class KotlinTestUtils {
assert jdk6 != null : "Environment variable JDK_16 is not set";
configuration.put(JVMConfigurationKeys.JDK_HOME, new File(jdk6));
}
else if (jdkKind == TestJdkKind.FULL_JDK_9) {
configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk9Home());
}
else if (jdkKind == TestJdkKind.FULL_JDK_17) {
configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk17Home());
}
@@ -415,8 +412,8 @@ public class KotlinTestUtils {
return JvmCompilationUtils.compileJavaFiles(files, options, javaErrorFile, JUnit4Assertions.INSTANCE);
}
public static boolean compileJavaFilesExternallyWithJava9(@NotNull Collection<File> files, @NotNull List<String> options) {
return JvmCompilationUtils.compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home());
public static boolean compileJavaFilesExternallyWithJava11(@NotNull Collection<File> files, @NotNull List<String> options) {
return JvmCompilationUtils.compileJavaFilesExternally(files, options, KtTestUtil.getJdk11Home());
}
public static boolean compileJavaFilesExternally(@NotNull Collection<File> files, @NotNull List<String> options, @NotNull File jdkHome) {
compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt
+4 -4
View File
@@ -38,7 +38,7 @@ object MockLibraryUtilExt {
allowKotlinSources: Boolean = true,
extraOptions: List<String> = emptyList(),
extraClasspath: List<String> = emptyList(),
useJava9: Boolean = false,
useJava11: Boolean = false,
): File {
return MockLibraryUtil.compileJvmLibraryToJar(
sourcesPath,
@@ -48,7 +48,7 @@ object MockLibraryUtilExt {
extraOptions,
extraClasspath,
extraModulepath = listOf(),
useJava9,
useJava11,
JUnit4Assertions
)
}
@@ -63,7 +63,7 @@ object MockLibraryUtilExt {
allowKotlinSources: Boolean = true,
extraOptions: List<String> = emptyList(),
extraClasspath: List<String> = emptyList(),
useJava9: Boolean = false
useJava11: Boolean = false
): File {
return MockLibraryUtil.compileLibraryToJar(
sourcesPath,
@@ -74,7 +74,7 @@ object MockLibraryUtilExt {
extraOptions,
extraClasspath,
extraModulepath = listOf(),
useJava9,
useJava11,
JUnit4Assertions
)
}