Environment creation unified everywhere.

JDK Kind turned into enum for clarity
This commit is contained in:
Andrey Breslav
2012-07-11 13:40:50 +04:00
parent fe6fa5dfaa
commit 207c75b956
7 changed files with 51 additions and 25 deletions
@@ -29,15 +29,10 @@ public abstract class KotlinTestWithEnvironmentManagement extends UsefulTestCase
}
protected JetCoreEnvironment createEnvironmentWithMockJdk(@NotNull ConfigurationKind configurationKind) {
return createEnvironmentWithJdk(configurationKind, true);
return createEnvironmentWithJdk(configurationKind, TestJdkKind.MOCK_JDK);
}
protected JetCoreEnvironment createEnvironmentWithJdk(@NotNull ConfigurationKind configurationKind, boolean mockJdk) {
JetCoreEnvironment environment = new JetCoreEnvironment(getTestRootDisposable(),
CompileCompilerDependenciesTest
.compilerConfigurationForTests(configurationKind, mockJdk)
);
environment.addToClasspath(JetTestUtils.getAnnotationsJar());
return environment;
protected JetCoreEnvironment createEnvironmentWithJdk(@NotNull ConfigurationKind configurationKind, @NotNull TestJdkKind jdkKind) {
return JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(getTestRootDisposable(), configurationKind, jdkKind);
}
}