From e0ea953ba2bab28eae156d9de1abeeb7302d6878 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Thu, 3 May 2012 17:05:37 +0400
Subject: [PATCH] stdlib is not needed in
 ResolveDescriptorsFromExternalLibraries test

---
 .../ResolveDescriptorsFromExternalLibraries.java  | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
index a6555c17113..266ef0db913 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
@@ -49,21 +49,12 @@ import java.util.zip.ZipInputStream;
  */
 public class ResolveDescriptorsFromExternalLibraries {
 
-    @NotNull
-    private final CompilerDependencies compilerDependencies;
-
 
     public static void main(String[] args) throws Exception {
         new ResolveDescriptorsFromExternalLibraries().run();
         System.out.println("$");
     }
 
-
-    public ResolveDescriptorsFromExternalLibraries() {
-        System.out.println("Getting compiler dependencies");
-        compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true);
-    }
-
     private void run() throws Exception {
         testLibraryFile(null, "rt.jar");
         testLibrary("com.google.guava", "guava", "12.0-rc2");
@@ -95,17 +86,17 @@ public class ResolveDescriptorsFromExternalLibraries {
 
         JetCoreEnvironment jetCoreEnvironment;
         if (jar != null) {
-            jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(junk);
+            jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(junk, CompilerSpecialMode.STDLIB);
             jetCoreEnvironment.addToClasspath(jar);
         }
         else {
-            CompilerDependencies compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, false);
+            CompilerDependencies compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.STDLIB, false);
             jetCoreEnvironment = JetCoreEnvironment.getCoreEnvironmentForJVM(junk, compilerDependencies);
             jar = compilerDependencies.getJdkJar();
         }
 
 
-        InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(compilerDependencies, jetCoreEnvironment.getProject());
+        InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(jetCoreEnvironment.getCompilerDependencies(), jetCoreEnvironment.getProject());
 
         FileInputStream is = new FileInputStream(jar);
         try {