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

Drop single-file mode of black box codegen tests

Browse Source 
Add regression test for #KT-5190
This commit is contained in:
Alexander Udalov
2016-03-01 19:24:31 +03:00
parent 2de7f38427
commit 933be1e035
3 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
+10 -20
View File
@@ -55,13 +55,17 @@ import static org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar;
public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
@Override
protected void doMultiFileTest(@NotNull File wholeFile, @NotNull List<TestFile> files, @Nullable File javaFilesDir) throws Exception {
if (files.size() == 1) {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
blackBoxFileByFullPath(wholeFile.getPath());
}
else {
doTestMultiFile(files, javaFilesDir);
TestJdkKind jdkKind = TestJdkKind.MOCK_JDK;
List<String> javacOptions = new ArrayList<String>(0);
for (TestFile file : files) {
if (isFullJdkDirectiveDefined(file.content)) {
jdkKind = TestJdkKind.FULL_JDK;
break;
}
javacOptions.addAll(InTextDirectivesUtils.findListWithPrefixes(file.content, "// JAVAC_OPTIONS:"));
}
compileAndRun(files, javaFilesDir, jdkKind, javacOptions);
}
protected void doTestWithStdlib(@NotNull String filename) {
@@ -76,20 +80,6 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
blackBoxFileByFullPath(filename);
}
private void doTestMultiFile(@NotNull List<TestFile> files, @Nullable File javaSourceDir) {
TestJdkKind jdkKind = TestJdkKind.MOCK_JDK;
List<String> javacOptions = new ArrayList<String>(0);
for (TestFile file : files) {
if (isFullJdkDirectiveDefined(file.content)) {
jdkKind = TestJdkKind.FULL_JDK;
break;
}
javacOptions.addAll(InTextDirectivesUtils.findListWithPrefixes(file.content, "// JAVAC_OPTIONS:"));
}
compileAndRun(files, javaSourceDir, jdkKind, javacOptions);
}
protected void compileAndRun(
@NotNull List<TestFile> files,
@Nullable File javaSourceDir,