From fd8b363a5f9e81f8979b52383509f52c8e89480d Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Mon, 20 Feb 2012 22:58:07 +0400 Subject: [PATCH] fix tests --- compiler/tests/org/jetbrains/jet/JetTestUtils.java | 6 +++++- .../org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index bdfa42d53f6..05d6ba11146 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -164,10 +164,14 @@ public class JetTestUtils { JetCoreEnvironment environment = new JetCoreEnvironment(disposable); final File rtJar = new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/rt.jar"); environment.addToClasspath(rtJar); - environment.addToClasspath(new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/annotations.jar")); + environment.addToClasspath(getAnnotationsJar()); 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 { if (file.isDirectory()) { diff --git a/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java index 5f16df365b6..8711dc85a14 100644 --- a/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java @@ -97,7 +97,7 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir { try { Iterable javaFileObjectsFromFiles = fileManager.getJavaFileObjectsFromFiles(Collections.singleton(javaFile)); List options = Arrays.asList( - "-classpath", "out/production/stdlib:ideaSDK/lib/annotations.jar", + "-classpath", "out/production/stdlib" + File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath(), "-d", tmpdir.getPath() ); JavaCompiler.CompilationTask task = javaCompiler.getTask(null, fileManager, null, options, null, javaFileObjectsFromFiles);