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

stdlib is not needed in ResolveDescriptorsFromExternalLibraries test

Browse Source
This commit is contained in:
Stepan Koltsov
2012-05-03 17:05:37 +04:00
parent 086827d4ca
commit e0ea953ba2
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
+3 -12
View File
@@ -49,21 +49,12 @@ import java.util.zip.ZipInputStream;
*/ */
public class ResolveDescriptorsFromExternalLibraries { public class ResolveDescriptorsFromExternalLibraries {
@NotNull
private final CompilerDependencies compilerDependencies;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
new ResolveDescriptorsFromExternalLibraries().run(); new ResolveDescriptorsFromExternalLibraries().run();
System.out.println("$"); System.out.println("$");
} }
public ResolveDescriptorsFromExternalLibraries() {
System.out.println("Getting compiler dependencies");
compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true);
}
private void run() throws Exception { private void run() throws Exception {
testLibraryFile(null, "rt.jar"); testLibraryFile(null, "rt.jar");
testLibrary("com.google.guava", "guava", "12.0-rc2"); testLibrary("com.google.guava", "guava", "12.0-rc2");
@@ -95,17 +86,17 @@ public class ResolveDescriptorsFromExternalLibraries {
JetCoreEnvironment jetCoreEnvironment; JetCoreEnvironment jetCoreEnvironment;
if (jar != null) { if (jar != null) {
jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(junk); jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(junk, CompilerSpecialMode.STDLIB);
jetCoreEnvironment.addToClasspath(jar); jetCoreEnvironment.addToClasspath(jar);
} }
else { else {
CompilerDependencies compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, false); CompilerDependencies compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.STDLIB, false);
jetCoreEnvironment = JetCoreEnvironment.getCoreEnvironmentForJVM(junk, compilerDependencies); jetCoreEnvironment = JetCoreEnvironment.getCoreEnvironmentForJVM(junk, compilerDependencies);
jar = compilerDependencies.getJdkJar(); jar = compilerDependencies.getJdkJar();
} }
InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(compilerDependencies, jetCoreEnvironment.getProject()); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(jetCoreEnvironment.getCompilerDependencies(), jetCoreEnvironment.getProject());
FileInputStream is = new FileInputStream(jar); FileInputStream is = new FileInputStream(jar);
try { try {