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

remove Jet from names of classes in tests: phase 2

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-03 14:05:20 +01:00
parent c604f98a1c
commit 19af88738b
382 changed files with 21630 additions and 21661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
+5 -5
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.resolve.AnalyzingUtils;
import org.jetbrains.kotlin.resolve.BindingTraceContext;
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import java.io.File;
@@ -120,11 +120,11 @@ public class CodegenTestUtil {
@NotNull List<String> additionalOptions
) {
try {
File javaClassesTempDirectory = JetTestUtils.tmpDir("java-classes");
File javaClassesTempDirectory = KotlinTestUtils.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.add(KotlinTestUtils.getAnnotationsJar().getPath());
classpath.addAll(additionalClasspath);
List<String> options = new ArrayList<String>(Arrays.asList(
@@ -136,11 +136,11 @@ public class CodegenTestUtil {
List<File> fileList = Lists.transform(fileNames, new Function<String, File>() {
@Override
public File apply(@Nullable String input) {
return new File(JetTestUtils.getTestDataPathBase() + "/codegen/" + input);
return new File(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + input);
}
});
JetTestUtils.compileJavaFiles(fileList, options);
KotlinTestUtils.compileJavaFiles(fileList, options);
return javaClassesTempDirectory;
}