JetTestUtils: change signature of compileJavaFile - take collection of files to compile and list of javac options

LoadDescriptorUtil: remove duplicate code
This commit is contained in:
Natalia.Ukhorskaya
2012-08-28 20:45:31 +04:00
parent b45f19c0e2
commit 04deb2dd2f
4 changed files with 15 additions and 28 deletions
@@ -52,6 +52,8 @@ import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
@@ -267,9 +269,12 @@ public abstract class CodegenTestCase extends UsefulTestCase {
protected void blackBoxFileWithJava(@NotNull String ktFile) throws Exception {
File javaClassesTempDirectory = new File(FileUtil.getTempDirectory(), "java-classes");
JetTestUtils.mkdirs(javaClassesTempDirectory);
JetTestUtils.compileJavaFile(
new File("compiler/testData/codegen/" + ktFile.replaceFirst("\\.kt$", ".java")),
javaClassesTempDirectory);
List<String> options = Arrays.asList(
"-d", javaClassesTempDirectory.getPath()
);
File javaFile = new File("compiler/testData/codegen/" + ktFile.replaceFirst("\\.kt$", ".java"));
JetTestUtils.compileJavaFiles(Collections.singleton(javaFile), options);
myEnvironment = new JetCoreEnvironment(getTestRootDisposable(), CompileCompilerDependenciesTest.compilerConfigurationForTests(
ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), javaClassesTempDirectory));