From 8b9fbdf9118df428abb31cd0da43eacc1b525d84 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 11 Dec 2013 17:59:19 +0400 Subject: [PATCH] Make Android test load files with diagnostics --- .../jet/compiler/android/CodegenTestsOnAndroidGenerator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java index cb44c3d98db..394a924d539 100644 --- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java @@ -26,6 +26,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.OutputFileCollection; import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.jet.codegen.CodegenTestFiles; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.compiler.PathManager; import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil; @@ -39,7 +40,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; - public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { private final PathManager pathManager; @@ -154,7 +154,8 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { } private static OutputFileCollection compileFromText(String filePath, String text, JetCoreEnvironment jetEnvironment) { - JetFile psiFile = JetTestUtils.createFile("dummy.kt", text, jetEnvironment.getProject()); + CodegenTestFiles codegenFile = CodegenTestFiles.create("dummy.kt", text, jetEnvironment.getProject()); + JetFile psiFile = codegenFile.getPsiFile(); OutputFileCollection outputFiles; try { outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);