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

Access to test root disposable through accessor

Browse Source
This commit is contained in:
Nikolay Krasko
2020-02-15 03:29:47 +03:00
committed by Nikolay Krasko
parent 272ccf64ae
commit 6c968859ad
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
+2 -2
View File
@@ -64,7 +64,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
List<File> kotlinSources = FileUtil.findFilesByMask(Pattern.compile(".+\\.kt"), sourcesDir); List<File> kotlinSources = FileUtil.findFilesByMask(Pattern.compile(".+\\.kt"), sourcesDir);
KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests(
myTestRootDisposable, newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, getClasspath(), getTestRootDisposable(), newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, getClasspath(),
Collections.emptyList()), EnvironmentConfigFiles.JVM_CONFIG_FILES Collections.emptyList()), EnvironmentConfigFiles.JVM_CONFIG_FILES
); );
registerJavacIfNeeded(environment); registerJavacIfNeeded(environment);
@@ -309,7 +309,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
@NotNull ConfigurationKind configurationKind @NotNull ConfigurationKind configurationKind
) throws IOException { ) throws IOException {
compileJavaWithAnnotationsJar(javaFiles, outDir); compileJavaWithAnnotationsJar(javaFiles, outDir);
return loadTestPackageAndBindingContextFromJavaRoot(outDir, myTestRootDisposable, getJdkKind(), configurationKind, true, return loadTestPackageAndBindingContextFromJavaRoot(outDir, getTestRootDisposable(), getJdkKind(), configurationKind, true,
usePsiClassFilesReading(), useJavacWrapper(), null, usePsiClassFilesReading(), useJavacWrapper(), null,
getExtraClasspath(), this::configureEnvironment); getExtraClasspath(), this::configureEnvironment);
} }
compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt
+1 -1
View File
@@ -53,7 +53,7 @@ class LoadJavaPackageAnnotationsTest : KtUsefulTestCase() {
} }
val environment = val environment =
KotlinCoreEnvironment.createForTests( KotlinCoreEnvironment.createForTests(
myTestRootDisposable, testRootDisposable,
configuration, configuration,
EnvironmentConfigFiles.JVM_CONFIG_FILES EnvironmentConfigFiles.JVM_CONFIG_FILES
).apply { ).apply {
compiler/tests/org/jetbrains/kotlin/jvm/compiler/MemoryOptimizationsTest.kt
+2 -2
View File
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.types.upperIfFlexible
class MemoryOptimizationsTest : KtUsefulTestCase() { class MemoryOptimizationsTest : KtUsefulTestCase() {
fun testBasicFlexibleTypeCase() { fun testBasicFlexibleTypeCase() {
val moduleDescriptor = JvmResolveUtil.analyze( val moduleDescriptor = JvmResolveUtil.analyze(
KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(myTestRootDisposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK) KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(testRootDisposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK)
).moduleDescriptor ).moduleDescriptor
val appendableClass = val appendableClass =
@@ -71,7 +71,7 @@ class MemoryOptimizationsTest : KtUsefulTestCase() {
val environment = val environment =
KotlinTestUtils KotlinTestUtils
.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( .createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
myTestRootDisposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK testRootDisposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK
) )
val moduleDescriptor = val moduleDescriptor =
JvmResolveUtil.analyze( JvmResolveUtil.analyze(
compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt
+1 -1
View File
@@ -101,7 +101,7 @@ class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() {
) )
} }
val environment = KotlinCoreEnvironment.createForTests(myTestRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
val container = JvmResolveUtil.createContainer(environment) val container = JvmResolveUtil.createContainer(environment)
val typeQualifierResolver = container.get<JavaResolverComponents>().annotationTypeQualifierResolver val typeQualifierResolver = container.get<JavaResolverComponents>().annotationTypeQualifierResolver
core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+4 -4
View File
@@ -14,6 +14,9 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass
import org.jetbrains.kotlin.descriptors.runtime.components.RuntimeModuleData
import org.jetbrains.kotlin.descriptors.runtime.structure.classId
import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.jvm.compiler.ExpectedLoadErrorsUtil import org.jetbrains.kotlin.jvm.compiler.ExpectedLoadErrorsUtil
import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil
@@ -38,9 +41,6 @@ import java.io.File
import java.net.URLClassLoader import java.net.URLClassLoader
import java.util.* import java.util.*
import java.util.regex.Pattern import java.util.regex.Pattern
import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass
import org.jetbrains.kotlin.descriptors.runtime.components.RuntimeModuleData
import org.jetbrains.kotlin.descriptors.runtime.structure.classId
abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() { abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
companion object { companion object {
@@ -129,7 +129,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
} }
fileName.endsWith(".kt") -> { fileName.endsWith(".kt") -> {
val environment = KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( val environment = KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
myTestRootDisposable, ConfigurationKind.ALL, jdkKind testRootDisposable, ConfigurationKind.ALL, jdkKind
) )
for (root in environment.configuration.getList(CLIConfigurationKeys.CONTENT_ROOTS)) { for (root in environment.configuration.getList(CLIConfigurationKeys.CONTENT_ROOTS)) {
LOG.info("root: $root") LOG.info("root: $root")