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

Just rename some variables like: *factory -> outputFiles

Browse Source
This commit is contained in:
Zalim Bashorov
2013-11-08 12:26:39 +04:00
parent 4cea0a3de4
commit 637c6635bd
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java
+10 -10
View File
@@ -23,9 +23,9 @@ import com.intellij.testFramework.UsefulTestCase;
import junit.framework.Assert;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.outputUtils.OutputUtilsPackage;
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.ClassFileFactory;
import org.jetbrains.jet.codegen.GenerationUtils;
import org.jetbrains.jet.compiler.PathManager;
import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil;
@@ -132,12 +132,12 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
String generatedTestName = generateTestName(file.getName());
String packageName = file.getPath().replaceAll("\\\\|-|\\.|/", "_");
text = changePackage(packageName, text);
ClassFileFactory factory;
OutputFileCollection outputFiles;
if (filesCompiledWithoutStdLib.contains(file.getName())) {
factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithMockJdk);
outputFiles = compileFromText(file.getAbsolutePath(), text, environmentWithMockJdk);
}
else {
factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdk);
outputFiles = compileFromText(file.getAbsolutePath(), text, environmentWithFullJdk);
}
generateTestMethod(p, generatedTestName, StringUtil.escapeStringCharacters(file.getPath()));
@@ -147,22 +147,22 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
}
Assert.assertTrue("Cannot create directory for compiled files", outputDir.exists());
OutputUtilsPackage.writeAllTo(factory, outputDir);
OutputUtilsPackage.writeAllTo(outputFiles, outputDir);
}
}
}
}
private static ClassFileFactory getFactoryFromText(String filePath, String text, JetCoreEnvironment jetEnvironment) {
private static OutputFileCollection compileFromText(String filePath, String text, JetCoreEnvironment jetEnvironment) {
JetFile psiFile = JetTestUtils.createFile("dummy.kt", text, jetEnvironment.getProject());
ClassFileFactory factory;
OutputFileCollection outputFiles;
try {
factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
}
catch (Throwable e) {
throw new RuntimeException("Cannot compile: " + filePath + "\n" + text, e);
}
return factory;
return outputFiles;
}
private static boolean hasBoxMethod(String text) {