diff --git a/compiler/testData/codegen/dumpDeclarations/classMembers.json b/compiler/testData/codegen/dumpDeclarations/classMembers.json index 6a80caa7385..e959e87e511 100644 --- a/compiler/testData/codegen/dumpDeclarations/classMembers.json +++ b/compiler/testData/codegen/dumpDeclarations/classMembers.json @@ -10,10 +10,10 @@ {"visibility": "public", "declaration": "final fun (): kotlin.Int", "name": "getPublicVar", "desc": "()I"}, {"visibility": "public", "declaration": "final fun (: kotlin.Int): kotlin.Unit", "name": "setPublicVar", "desc": "(I)V"}, {"visibility": "internal", "declaration": "final val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"}, - {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVal$java_integration_test", "desc": "()J"}, + {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVal$test_module", "desc": "()J"}, {"visibility": "internal", "declaration": "final var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"}, - {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVar$java_integration_test", "desc": "()J"}, - {"visibility": "internal", "declaration": "final fun (: kotlin.Long): kotlin.Unit", "name": "setInternalVar$java_integration_test", "desc": "(J)V"}, + {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVar$test_module", "desc": "()J"}, + {"visibility": "internal", "declaration": "final fun (: kotlin.Long): kotlin.Unit", "name": "setInternalVar$test_module", "desc": "(J)V"}, {"visibility": "protected", "declaration": "final val protectedVal: kotlin.String", "name": "protectedVal", "desc": "Ljava/lang/String;"}, {"visibility": "protected", "declaration": "final fun (): kotlin.String", "name": "getProtectedVal", "desc": "()Ljava/lang/String;"}, {"visibility": "protected", "declaration": "final var protectedVar: kotlin.String", "name": "protectedVar", "desc": "Ljava/lang/String;"}, @@ -34,12 +34,12 @@ {"visibility": "public", "declaration": "final fun (: kotlin.String): kotlin.Unit", "name": "setPublicVar", "desc": "(Ljava/lang/String;)V"}, {"visibility": "public", "declaration": "final lateinit var publicVarInternalSet: kotlin.String", "name": "publicVarInternalSet", "desc": "Ljava/lang/String;"}, {"visibility": "public", "declaration": "final fun (): kotlin.String", "name": "getPublicVarInternalSet", "desc": "()Ljava/lang/String;"}, - {"visibility": "internal", "declaration": "final fun (: kotlin.String): kotlin.Unit", "name": "setPublicVarInternalSet$java_integration_test", "desc": "(Ljava/lang/String;)V"}, + {"visibility": "internal", "declaration": "final fun (: kotlin.String): kotlin.Unit", "name": "setPublicVarInternalSet$test_module", "desc": "(Ljava/lang/String;)V"}, {"visibility": "internal", "declaration": "final lateinit var internalVar: kotlin.String", "name": "internalVar", "desc": "Ljava/lang/String;"}, - {"visibility": "internal", "declaration": "final fun (): kotlin.String", "name": "getInternalVar$java_integration_test", "desc": "()Ljava/lang/String;"}, - {"visibility": "internal", "declaration": "final fun (: kotlin.String): kotlin.Unit", "name": "setInternalVar$java_integration_test", "desc": "(Ljava/lang/String;)V"}, + {"visibility": "internal", "declaration": "final fun (): kotlin.String", "name": "getInternalVar$test_module", "desc": "()Ljava/lang/String;"}, + {"visibility": "internal", "declaration": "final fun (: kotlin.String): kotlin.Unit", "name": "setInternalVar$test_module", "desc": "(Ljava/lang/String;)V"}, {"visibility": "internal", "declaration": "final lateinit var internalVarPrivateSet: kotlin.String", "name": "internalVarPrivateSet", "desc": "Ljava/lang/String;"}, - {"visibility": "internal", "declaration": "final fun (): kotlin.String", "name": "getInternalVarPrivateSet$java_integration_test", "desc": "()Ljava/lang/String;"}, + {"visibility": "internal", "declaration": "final fun (): kotlin.String", "name": "getInternalVarPrivateSet$test_module", "desc": "()Ljava/lang/String;"}, {"visibility": "private", "declaration": "final fun (: kotlin.String): kotlin.Unit", "name": "setInternalVarPrivateSet", "desc": "(Ljava/lang/String;)V"}, {"visibility": "protected", "declaration": "final lateinit var protectedVar: kotlin.String", "name": "protectedVar", "desc": "Ljava/lang/String;"}, {"visibility": "protected", "declaration": "final fun (): kotlin.String", "name": "getProtectedVar", "desc": "()Ljava/lang/String;"}, @@ -84,13 +84,13 @@ "class": "ClassWithFunctions", "members": [ {"visibility": "public", "declaration": "final fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"}, - {"visibility": "internal", "declaration": "final fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun$java_integration_test", "desc": "(I)V"}, + {"visibility": "internal", "declaration": "final fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun$test_module", "desc": "(I)V"}, {"visibility": "protected", "declaration": "final fun protectedFun(a: kotlin.String, b: kotlin.Long): kotlin.Unit", "name": "protectedFun", "desc": "(Ljava/lang/String;J)V"}, {"visibility": "private", "declaration": "final fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "privateFun", "desc": "(Ljava/lang/Object;)V"}, - {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$java_integration_test", "desc": "(Ljava/lang/String;Ljava/lang/Long;)V"}, - {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$java_integration_test$default", "desc": "(LClassWithFunctions;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V"}, - {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$java_integration_test", "desc": "(Ljava/lang/String;)V"}, - {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$java_integration_test", "desc": "()V"}, + {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module", "desc": "(Ljava/lang/String;Ljava/lang/Long;)V"}, + {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module$default", "desc": "(LClassWithFunctions;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V"}, + {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module", "desc": "(Ljava/lang/String;)V"}, + {"visibility": "internal", "declaration": "final fun internalOverloads(a: kotlin.String = ..., b: kotlin.Long? = ...): kotlin.Unit", "name": "internalOverloads$test_module", "desc": "()V"}, {"visibility": "public", "declaration": "constructor ClassWithFunctions()", "name": "", "desc": "()V"} ] }, @@ -105,10 +105,10 @@ {"visibility": "public", "declaration": "final fun (): kotlin.Int", "name": "getPublicVar", "desc": "()I"}, {"visibility": "public", "declaration": "final fun (: kotlin.Int): kotlin.Unit", "name": "setPublicVar", "desc": "(I)V"}, {"visibility": "internal", "declaration": "final val internalVal: kotlin.Long", "name": "internalVal", "desc": "J"}, - {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVal$java_integration_test", "desc": "()J"}, + {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVal$test_module", "desc": "()J"}, {"visibility": "internal", "declaration": "final var internalVar: kotlin.Long", "name": "internalVar", "desc": "J"}, - {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVar$java_integration_test", "desc": "()J"}, - {"visibility": "internal", "declaration": "final fun (: kotlin.Long): kotlin.Unit", "name": "setInternalVar$java_integration_test", "desc": "(J)V"}, + {"visibility": "internal", "declaration": "final fun (): kotlin.Long", "name": "getInternalVar$test_module", "desc": "()J"}, + {"visibility": "internal", "declaration": "final fun (: kotlin.Long): kotlin.Unit", "name": "setInternalVar$test_module", "desc": "(J)V"}, {"visibility": "private", "declaration": "final val privateVal: kotlin.Any?", "name": "privateVal", "desc": "Ljava/lang/Object;"}, {"visibility": "private", "declaration": "final var privateVar: kotlin.Any?", "name": "privateVar", "desc": "Ljava/lang/Object;"}, {"visibility": "private", "declaration": "constructor ObjectWithProperties()", "name": "", "desc": "()V"}, @@ -136,7 +136,7 @@ "class": "ObjectWithFunctions", "members": [ {"visibility": "public", "declaration": "final fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"}, - {"visibility": "internal", "declaration": "final fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun$java_integration_test", "desc": "(I)V"}, + {"visibility": "internal", "declaration": "final fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun$test_module", "desc": "(I)V"}, {"visibility": "protected", "declaration": "final fun protectedFun(a: kotlin.String, b: kotlin.Long): kotlin.Unit", "name": "protectedFun", "desc": "(Ljava/lang/String;J)V"}, {"visibility": "private", "declaration": "final fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "privateFun", "desc": "(Ljava/lang/Object;)V"}, {"visibility": "public", "declaration": "constructor ObjectWithFunctions()", "name": "", "desc": "()V"} diff --git a/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json b/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json index fc2d6730e68..f92dfee477d 100644 --- a/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json +++ b/compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json @@ -26,7 +26,7 @@ "visibility": "private", "class": "PrivateClass", "members": [ - {"visibility": "internal", "declaration": "final fun accessUsage(): kotlin.Unit", "name": "accessUsage$java_integration_test", "desc": "()V"}, + {"visibility": "internal", "declaration": "final fun accessUsage(): kotlin.Unit", "name": "accessUsage$test_module", "desc": "()V"}, {"visibility": "public", "declaration": "constructor PrivateClass()", "name": "", "desc": "()V"} ] }, diff --git a/compiler/testData/codegen/dumpDeclarations/topLevelMembers.json b/compiler/testData/codegen/dumpDeclarations/topLevelMembers.json index 0978655f45b..1eced6a57a4 100644 --- a/compiler/testData/codegen/dumpDeclarations/topLevelMembers.json +++ b/compiler/testData/codegen/dumpDeclarations/topLevelMembers.json @@ -4,7 +4,7 @@ "visibility": "private", "class": "PrivateClass", "members": [ - {"visibility": "internal", "declaration": "final fun accessUsage(): kotlin.Unit", "name": "accessUsage$java_integration_test", "desc": "()V"}, + {"visibility": "internal", "declaration": "final fun accessUsage(): kotlin.Unit", "name": "accessUsage$test_module", "desc": "()V"}, {"visibility": "public", "declaration": "constructor PrivateClass()", "name": "", "desc": "()V"} ] }, diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 0afc14d17b1..2ddb59f40eb 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -37,7 +37,6 @@ import org.jetbrains.kotlin.renderer.DescriptorRendererModifier import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.resolve.scopes.ChainedMemberScope import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.MemberScope @@ -91,7 +90,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() { val classLoader = URLClassLoader(arrayOf(tmpdir.toURI().toURL()), ForTestCompileRuntime.runtimeAndReflectJarClassLoader()) - val actual = createReflectedPackageView(classLoader, JvmResolveUtil.TEST_MODULE_NAME) + val actual = createReflectedPackageView(classLoader, KotlinTestUtils.TEST_MODULE_NAME) val comparatorConfiguration = Configuration( /* checkPrimaryConstructors = */ fileName.endsWith(".kt"), diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java index bc372f4800c..4a3d3c32c4f 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java @@ -27,13 +27,12 @@ import org.jetbrains.kotlin.descriptors.PackagePartProvider; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.util.Collection; import java.util.Collections; public class JvmResolveUtil { - public static String TEST_MODULE_NAME = "java-integration-test"; - @NotNull public static AnalysisResult analyzeAndCheckForErrors(@NotNull KtFile file, @NotNull KotlinCoreEnvironment environment) { return analyzeAndCheckForErrors(Collections.singleton(file), environment); @@ -90,7 +89,7 @@ public class JvmResolveUtil { @NotNull PackagePartProvider packagePartProvider ) { return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, TEST_MODULE_NAME), + TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, KotlinTestUtils.TEST_MODULE_NAME), files, new CliLightClassGenerationSupport.CliBindingTrace(), configuration, packagePartProvider ); } diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index 2a87a43fb47..ddd11365026 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -98,6 +98,8 @@ import java.util.regex.Pattern; import static org.jetbrains.kotlin.config.JVMConfigurationKeys.MODULE_NAME; public class KotlinTestUtils { + public static String TEST_MODULE_NAME = "test-module"; + public static final String TEST_GENERATOR_NAME = "org.jetbrains.kotlin.generators.tests.TestsPackage"; public static final String PLEASE_REGENERATE_TESTS = "Please regenerate tests (GenerateTests.kt)"; @@ -465,7 +467,7 @@ public class KotlinTestUtils { JvmContentRootsKt.addJvmClasspathRoots(configuration, classpath); - configuration.put(MODULE_NAME, JvmResolveUtil.TEST_MODULE_NAME); + configuration.put(MODULE_NAME, TEST_MODULE_NAME); return configuration; } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index 25d91c34d62..80c055b03e8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor +import org.jetbrains.kotlin.test.KotlinTestUtils class DecompiledTextConsistencyTest : TextConsistencyBaseTest() { @@ -50,7 +51,7 @@ class DecompiledTextConsistencyTest : TextConsistencyBaseTest() { override fun getModuleDescriptor(): ModuleDescriptor = TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, JvmResolveUtil.TEST_MODULE_NAME), + TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, KotlinTestUtils.TEST_MODULE_NAME), listOf(), BindingTraceContext(), CompilerConfiguration.EMPTY, IDEPackagePartProvider(GlobalSearchScope.allScope(project)) ).moduleDescriptor