Fix runtime dependency in codegen/box tests, delete old doTestWithStdlib logic
Codegen tests in "compiler/testData/codegen/box" started to run with
ConfigurationKind.ALL accidentally in 933be1e. This commit fixes it
This commit is contained in:
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil;
|
|||||||
import com.intellij.util.Processor;
|
import com.intellij.util.Processor;
|
||||||
import kotlin.collections.ArraysKt;
|
import kotlin.collections.ArraysKt;
|
||||||
import kotlin.io.FilesKt;
|
import kotlin.io.FilesKt;
|
||||||
import kotlin.text.Charsets;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;
|
import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;
|
||||||
@@ -57,30 +56,22 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
|
|||||||
TestJdkKind jdkKind = TestJdkKind.MOCK_JDK;
|
TestJdkKind jdkKind = TestJdkKind.MOCK_JDK;
|
||||||
List<String> javacOptions = new ArrayList<String>(0);
|
List<String> javacOptions = new ArrayList<String>(0);
|
||||||
for (TestFile file : files) {
|
for (TestFile file : files) {
|
||||||
if (isFullJdkDirectiveDefined(file.content)) {
|
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "FULL_JDK")) {
|
||||||
jdkKind = TestJdkKind.FULL_JDK;
|
jdkKind = TestJdkKind.FULL_JDK;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "NO_KOTLIN_REFLECT")) {
|
||||||
|
configurationKind = ConfigurationKind.NO_KOTLIN_REFLECT;
|
||||||
|
}
|
||||||
|
|
||||||
javacOptions.addAll(InTextDirectivesUtils.findListWithPrefixes(file.content, "// JAVAC_OPTIONS:"));
|
javacOptions.addAll(InTextDirectivesUtils.findListWithPrefixes(file.content, "// JAVAC_OPTIONS:"));
|
||||||
}
|
}
|
||||||
|
|
||||||
compileAndRun(files, javaFilesDir, jdkKind, javacOptions);
|
compileAndRun(files, javaFilesDir, jdkKind, javacOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void doTestWithStdlib(@NotNull String filename) {
|
protected void doTestWithStdlib(@NotNull String filename) throws Exception {
|
||||||
configurationKind = InTextDirectivesUtils.isDirectiveDefined(
|
configurationKind = ConfigurationKind.ALL;
|
||||||
FilesKt.readText(new File(filename), Charsets.UTF_8), "NO_KOTLIN_REFLECT"
|
doTest(filename);
|
||||||
) ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.ALL;
|
|
||||||
|
|
||||||
TestJdkKind jdkKind = isFullJdkDirectiveDefined(FilesKt.readText(new File(filename), Charsets.UTF_8))
|
|
||||||
? TestJdkKind.FULL_JDK
|
|
||||||
: TestJdkKind.MOCK_JDK;
|
|
||||||
|
|
||||||
myEnvironment = KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
|
|
||||||
getTestRootDisposable(), configurationKind, jdkKind
|
|
||||||
);
|
|
||||||
|
|
||||||
blackBoxFileByFullPath(filename);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void compileAndRun(
|
protected void compileAndRun(
|
||||||
@@ -90,7 +81,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
|
|||||||
@NotNull List<String> javacOptions
|
@NotNull List<String> javacOptions
|
||||||
) {
|
) {
|
||||||
CompilerConfiguration configuration = compilerConfigurationForTests(
|
CompilerConfiguration configuration = compilerConfigurationForTests(
|
||||||
ConfigurationKind.ALL, jdkKind, Collections.singletonList(getAnnotationsJar()),
|
configurationKind, jdkKind, Collections.singletonList(getAnnotationsJar()),
|
||||||
ArraysKt.filterNotNull(new File[] {javaSourceDir})
|
ArraysKt.filterNotNull(new File[] {javaSourceDir})
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -143,15 +134,6 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
|
|||||||
return javaFilePaths;
|
return javaFilePaths;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isFullJdkDirectiveDefined(@NotNull String content) {
|
|
||||||
return InTextDirectivesUtils.isDirectiveDefined(content, "FULL_JDK");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void blackBoxFileByFullPath(@NotNull String filename) {
|
|
||||||
loadFileByFullPath(filename);
|
|
||||||
blackBox();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void blackBox() {
|
protected void blackBox() {
|
||||||
// If there are many files, the first 'box(): String' function will be executed.
|
// If there are many files, the first 'box(): String' function will be executed.
|
||||||
GeneratedClassLoader generatedClassLoader = generateAndCreateClassLoader();
|
GeneratedClassLoader generatedClassLoader = generateAndCreateClassLoader();
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
|
|||||||
protected CodegenTestFiles myFiles;
|
protected CodegenTestFiles myFiles;
|
||||||
protected ClassFileFactory classFileFactory;
|
protected ClassFileFactory classFileFactory;
|
||||||
protected GeneratedClassLoader initializedClassLoader;
|
protected GeneratedClassLoader initializedClassLoader;
|
||||||
protected ConfigurationKind configurationKind;
|
protected ConfigurationKind configurationKind = ConfigurationKind.JDK_ONLY;
|
||||||
|
|
||||||
protected final void createEnvironmentWithMockJdkAndIdeaAnnotations(
|
protected final void createEnvironmentWithMockJdkAndIdeaAnnotations(
|
||||||
@NotNull ConfigurationKind configurationKind,
|
@NotNull ConfigurationKind configurationKind,
|
||||||
|
|||||||
Reference in New Issue
Block a user