From fc7bb67acad5eb8f6794295e201568ee5161b7a4 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 29 Mar 2013 16:10:35 +0400
Subject: [PATCH] Add extended annotation to test environment

---
 compiler/tests/org/jetbrains/jet/JetTestUtils.java          | 6 +++++-
 .../org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java  | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index 9aa967a02e9..09f0f4d8ac2 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -226,7 +226,7 @@ public class JetTestUtils {
             @NotNull TestJdkKind jdkKind
     ) {
         return new JetCoreEnvironment(disposable, compilerConfigurationForTests(
-                configurationKind, jdkKind, getAnnotationsJar()));
+                configurationKind, jdkKind, getAnnotationsJar(), getAnnotationsExtJar()));
     }
 
     public static File findMockJdkRtJar() {
@@ -237,6 +237,10 @@ public class JetTestUtils {
         return new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/annotations.jar");
     }
 
+    public static File getAnnotationsExtJar() {
+        return new File(JetTestCaseBuilder.getHomeDirectory(), "dist/kotlinc/lib/kotlin-annotations-ext.jar");
+    }
+
     public static void mkdirs(File file) throws IOException {
         if (file.isDirectory()) {
             return;
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
index 6ff342a8a2c..914a028735b 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
@@ -121,7 +121,9 @@ public final class LoadDescriptorUtil {
     }
 
     private static void compileJavaWithAnnotationsJar(@NotNull Collection<File> javaFiles, @NotNull File outDir) throws IOException {
-        String classPath = "out/production/runtime" + File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath();
+        String classPath = "out/production/runtime" +
+                           File.pathSeparator + JetTestUtils.getAnnotationsJar().getPath() +
+                           File.pathSeparator + JetTestUtils.getAnnotationsExtJar().getPath();
         JetTestUtils.compileJavaFiles(javaFiles, Arrays.asList(
                 "-classpath", classPath,
                 "-sourcepath", "compiler/tests", // for @ExpectLoadError annotation