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

fix tests

Browse Source
This commit is contained in:
Stepan Koltsov
2012-02-20 22:58:07 +04:00
parent b67f028ff2
commit fd8b363a5f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+5 -1
View File
@@ -164,10 +164,14 @@ public class JetTestUtils {
JetCoreEnvironment environment = new JetCoreEnvironment(disposable); JetCoreEnvironment environment = new JetCoreEnvironment(disposable);
final File rtJar = new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/rt.jar"); final File rtJar = new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/rt.jar");
environment.addToClasspath(rtJar); environment.addToClasspath(rtJar);
environment.addToClasspath(new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/annotations.jar")); environment.addToClasspath(getAnnotationsJar());
return environment; return environment;
} }
public static File getAnnotationsJar() {
return new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/annotations.jar");
}
public static void mkdirs(File file) throws IOException { public static void mkdirs(File file) throws IOException {
if (file.isDirectory()) { if (file.isDirectory()) {
compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir {
try { try {
Iterable<? extends JavaFileObject> javaFileObjectsFromFiles = fileManager.getJavaFileObjectsFromFiles(Collections.singleton(javaFile)); Iterable<? extends JavaFileObject> javaFileObjectsFromFiles = fileManager.getJavaFileObjectsFromFiles(Collections.singleton(javaFile));
List<String> options = Arrays.asList( List<String> options = Arrays.asList(
"-classpath", "out/production/stdlib:ideaSDK/lib/annotations.jar", "-classpath", "out/production/stdlib" + File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath(),
"-d", tmpdir.getPath() "-d", tmpdir.getPath()
); );
JavaCompiler.CompilationTask task = javaCompiler.getTask(null, fileManager, null, options, null, javaFileObjectsFromFiles); JavaCompiler.CompilationTask task = javaCompiler.getTask(null, fileManager, null, options, null, javaFileObjectsFromFiles);