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

Test classpath order of sources vs library dependencies

Browse Source
This commit is contained in:
Alexander Udalov
2015-01-28 19:00:55 +03:00
parent 2253567e36
commit de3f096ae1
4 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
+23 -12
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.test;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.io.ZipUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.common.ExitCode;
@@ -96,23 +97,14 @@ public class MockLibraryUtil {
}
// Runs compiler in custom class loader to avoid effects caused by replacing Application with another one created in compiler.
public static void compileKotlin(@NotNull String sourcesPath, @NotNull File outDir, @NotNull String... extraClasspath) {
private static void runCompiler(@NotNull List<String> args) {
try {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
Class<?> compilerClass = getCompilerClass();
Object compilerObject = compilerClass.newInstance();
Object compiler = compilerClass.newInstance();
Method execMethod = compilerClass.getMethod("exec", PrintStream.class, String[].class);
List<String> classpath = new ArrayList<String>();
classpath.add(sourcesPath);
Collections.addAll(classpath, extraClasspath);
String newClasspath = StringUtil.join(classpath, File.pathSeparator);
//noinspection IOResourceOpenedButNotSafelyClosed
Enum<?> invocationResult = (Enum<?>) execMethod.invoke(
compilerObject, new PrintStream(outStream),
new String[] {sourcesPath, "-d", outDir.getAbsolutePath(), "-classpath", newClasspath}
);
Enum<?> invocationResult = (Enum<?>) execMethod.invoke(compiler, new PrintStream(outStream), ArrayUtil.toStringArray(args));
assertEquals(new String(outStream.toByteArray()), ExitCode.OK.name(), invocationResult.name());
}
@@ -121,6 +113,25 @@ public class MockLibraryUtil {
}
}
public static void compileKotlin(@NotNull String sourcesPath, @NotNull File outDir, @NotNull String... extraClasspath) {
List<String> classpath = new ArrayList<String>();
classpath.add(sourcesPath);
Collections.addAll(classpath, extraClasspath);
List<String> args = new ArrayList<String>();
args.add(sourcesPath);
args.add("-d");
args.add(outDir.getAbsolutePath());
args.add("-classpath");
args.add(StringUtil.join(classpath, File.pathSeparator));
runCompiler(args);
}
public static void compileKotlinModule(@NotNull String modulePath) {
runCompiler(Arrays.asList("-no-stdlib", "-module", modulePath));
}
@NotNull
private static synchronized Class<?> getCompilerClass() throws IOException, ClassNotFoundException {
Class<?> compilerClass = compilerClassRef.get();