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

Move TEST_MODULE_NAME to KotlinTestUtils and change value to "test-module"

Browse Source 
This name is more generic and thus can be used everywhere, not only in Java
integration tests
This commit is contained in:
Alexander Udalov
2016-05-23 12:19:22 +03:00
parent 3ca77de924
commit 69343549b7
7 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/dumpDeclarations/classMembers.json
Vendored
+16 -16
View File
@@ -10,10 +10,10 @@
{"visibility": "public", "declaration": "final fun <get-publicVar>(): kotlin.Int", "name": "getPublicVar", "desc": "()I"},
{"visibility": "public", "declaration": "final fun <set-publicVar>(<set-?>: 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 <get-internalVal>(): kotlin.Long", "name": "getInternalVal$java_integration_test", "desc": "()J"},
{"visibility": "internal", "declaration": "final fun <get-internalVal>(): 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 <get-internalVar>(): kotlin.Long", "name": "getInternalVar$java_integration_test", "desc": "()J"},
{"visibility": "internal", "declaration": "final fun <set-internalVar>(<set-?>: kotlin.Long): kotlin.Unit", "name": "setInternalVar$java_integration_test", "desc": "(J)V"},
{"visibility": "internal", "declaration": "final fun <get-internalVar>(): kotlin.Long", "name": "getInternalVar$test_module", "desc": "()J"},
{"visibility": "internal", "declaration": "final fun <set-internalVar>(<set-?>: 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 <get-protectedVal>(): 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 <set-publicVar>(<set-?>: 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 <get-publicVarInternalSet>(): kotlin.String", "name": "getPublicVarInternalSet", "desc": "()Ljava/lang/String;"},
{"visibility": "internal", "declaration": "final fun <set-publicVarInternalSet>(<set-?>: kotlin.String): kotlin.Unit", "name": "setPublicVarInternalSet$java_integration_test", "desc": "(Ljava/lang/String;)V"},
{"visibility": "internal", "declaration": "final fun <set-publicVarInternalSet>(<set-?>: 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 <get-internalVar>(): kotlin.String", "name": "getInternalVar$java_integration_test", "desc": "()Ljava/lang/String;"},
{"visibility": "internal", "declaration": "final fun <set-internalVar>(<set-?>: kotlin.String): kotlin.Unit", "name": "setInternalVar$java_integration_test", "desc": "(Ljava/lang/String;)V"},
{"visibility": "internal", "declaration": "final fun <get-internalVar>(): kotlin.String", "name": "getInternalVar$test_module", "desc": "()Ljava/lang/String;"},
{"visibility": "internal", "declaration": "final fun <set-internalVar>(<set-?>: 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 <get-internalVarPrivateSet>(): kotlin.String", "name": "getInternalVarPrivateSet$java_integration_test", "desc": "()Ljava/lang/String;"},
{"visibility": "internal", "declaration": "final fun <get-internalVarPrivateSet>(): kotlin.String", "name": "getInternalVarPrivateSet$test_module", "desc": "()Ljava/lang/String;"},
{"visibility": "private", "declaration": "final fun <set-internalVarPrivateSet>(<set-?>: 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 <get-protectedVar>(): 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": "<init>", "desc": "()V"}
]
},
@@ -105,10 +105,10 @@
{"visibility": "public", "declaration": "final fun <get-publicVar>(): kotlin.Int", "name": "getPublicVar", "desc": "()I"},
{"visibility": "public", "declaration": "final fun <set-publicVar>(<set-?>: 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 <get-internalVal>(): kotlin.Long", "name": "getInternalVal$java_integration_test", "desc": "()J"},
{"visibility": "internal", "declaration": "final fun <get-internalVal>(): 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 <get-internalVar>(): kotlin.Long", "name": "getInternalVar$java_integration_test", "desc": "()J"},
{"visibility": "internal", "declaration": "final fun <set-internalVar>(<set-?>: kotlin.Long): kotlin.Unit", "name": "setInternalVar$java_integration_test", "desc": "(J)V"},
{"visibility": "internal", "declaration": "final fun <get-internalVar>(): kotlin.Long", "name": "getInternalVar$test_module", "desc": "()J"},
{"visibility": "internal", "declaration": "final fun <set-internalVar>(<set-?>: 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": "<init>", "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": "<init>", "desc": "()V"}
compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json
Vendored
+1 -1
View File
@@ -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": "<init>", "desc": "()V"}
]
},
compiler/testData/codegen/dumpDeclarations/topLevelMembers.json
Vendored
+1 -1
View File
@@ -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": "<init>", "desc": "()V"}
]
},
compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+1 -2
View File
@@ -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"),
compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java
+2 -3
View File
@@ -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
);
}
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+3 -1
View File
@@ -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;
}
idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt
+2 -1
View File
@@ -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