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

Support for WITH_RUNTIME test on android

Browse Source
This commit is contained in:
Michael Bogdanov
2016-04-22 18:41:49 +03:00
parent 6228b11048
commit bc16be9735
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+9 -4
View File
@@ -24,6 +24,7 @@ import com.intellij.testFramework.UsefulTestCase;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;
import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.codegen.CodegenTestFiles; import org.jetbrains.kotlin.codegen.CodegenTestFiles;
import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.GenerationUtils;
@@ -171,8 +172,12 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
System.out.println("Generating " + filesToCompile.size() + " files..."); System.out.println("Generating " + filesToCompile.size() + " files...");
OutputFileCollection outputFiles; OutputFileCollection outputFiles;
try { try {
outputFiles = GenerationUtils outputFiles = GenerationUtils.compileManyFilesGetGenerationStateForTest(
.compileManyFilesGetGenerationStateForTest(filesToCompile.iterator().next().getProject(), filesToCompile).getFactory(); filesToCompile.iterator().next().getProject(),
filesToCompile,
new JvmPackagePartProvider(environment),
null
).getFactory();
} }
catch (Throwable e) { catch (Throwable e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -216,8 +221,8 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
String text = FileUtil.loadFile(file, true); String text = FileUtil.loadFile(file, true);
//TODO: support multifile tests //TODO: support multifile tests
if (text.contains("FILE:")) continue; if (text.contains("FILE:")) continue;
//TODO: support WITH_RUNTIME & WITH_REFLECT //TODO: support JvmFileName & WITH_REFLECT
if (text.contains("WITH_RUNTIME") || text.contains("WITH_REFLECT")) continue; if (text.contains("WITH_REFLECT") || text.contains("JvmFileName")) continue;
if (hasBoxMethod(text)) { if (hasBoxMethod(text)) {
String generatedTestName = generateTestName(file.getName()); String generatedTestName = generateTestName(file.getName());