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

Minor, move boxAgainstJava logic to a separate test class

Browse Source
This commit is contained in:
Alexander Udalov
2016-03-01 16:45:44 +03:00
parent 280ad195ee
commit e7371d2c1a
4 changed files with 86 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
+8 -26
View File
@@ -83,7 +83,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
blackBoxFileByFullPath(filename);
}
private void doTestMultiFile(@NotNull List<TestFile> files, @Nullable File javaSourceDir) throws Exception {
private void doTestMultiFile(@NotNull List<TestFile> files, @Nullable File javaSourceDir) {
TestJdkKind jdkKind = TestJdkKind.MOCK_JDK;
for (TestFile file : files) {
if (isFullJdkDirectiveDefined(file.content)) {
@@ -92,35 +92,17 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
}
}
File javaOutputDir;
if (javaSourceDir != null) {
final List<String> javaSourceFilePaths = new ArrayList<String>();
FileUtil.processFilesRecursively(javaSourceDir, new Processor<File>() {
@Override
public boolean process(File file) {
if (file.isFile() && file.getName().endsWith(".java")) {
javaSourceFilePaths.add(file.getPath());
}
return true;
}
});
javaOutputDir = compileJava(javaSourceFilePaths, Collections.<String>emptyList(), Collections.<String>emptyList());
}
else {
javaOutputDir = null;
}
CompilerConfiguration configuration =
compilerConfigurationForTests(ConfigurationKind.ALL, jdkKind, getAnnotationsJar(), javaOutputDir);
myEnvironment =
KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
createEnvironment(jdkKind, javaSourceDir);
loadMultiFiles(files);
blackBox();
}
protected void createEnvironment(@NotNull TestJdkKind jdkKind, @Nullable File javaSourceDir) {
CompilerConfiguration configuration = compilerConfigurationForTests(ConfigurationKind.ALL, jdkKind, getAnnotationsJar());
myEnvironment =
KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
}
// NOTE: tests under fullJdk/ are run with FULL_JDK instead of MOCK_JDK
@NotNull
private static TestJdkKind getTestJdkKind(@NotNull String sourcePath) {