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

Support parameter names for Java 8 classes in reflection

Browse Source 
Also support specifying additional options to javac in codegen tests, which was
needed to compile Java sources with the "-parameters" option
This commit is contained in:
Alexander Udalov
2015-08-25 13:34:20 +03:00
parent 30967baca8
commit 89f3cfc704
9 changed files with 125 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
+12 -6
View File
@@ -111,24 +111,30 @@ public class CodegenTestUtil {
@NotNull
public static File compileJava(@NotNull String filename, @NotNull String... additionalClasspath) {
return compileJava(Collections.singletonList(filename), additionalClasspath);
return compileJava(Collections.singletonList(filename), Arrays.asList(additionalClasspath), Collections.<String>emptyList());
}
@NotNull
public static File compileJava(@NotNull List<String> filenames, @NotNull String... additionalClasspath) {
public static File compileJava(
@NotNull List<String> fileNames,
@NotNull List<String> additionalClasspath,
@NotNull List<String> additionalOptions
) {
try {
File javaClassesTempDirectory = JetTestUtils.tmpDir("java-classes");
List<String> classpath = new ArrayList<String>();
classpath.add(ForTestCompileRuntime.runtimeJarForTests().getPath());
classpath.add(ForTestCompileRuntime.reflectJarForTests().getPath());
classpath.add(JetTestUtils.getAnnotationsJar().getPath());
classpath.addAll(Arrays.asList(additionalClasspath));
List<String> options = Arrays.asList(
classpath.addAll(additionalClasspath);
List<String> options = new ArrayList<String>(Arrays.asList(
"-classpath", KotlinPackage.join(classpath, File.pathSeparator, "", "", -1, ""),
"-d", javaClassesTempDirectory.getPath()
);
));
options.addAll(additionalOptions);
List<File> fileList = Lists.transform(filenames, new Function<String, File>() {
List<File> fileList = Lists.transform(fileNames, new Function<String, File>() {
@Override
public File apply(@Nullable String input) {
return new File(JetTestUtils.getTestDataPathBase() + "/codegen/" + input);