FIR LC: use the same module name as U/LC tests in IJ

This commit is contained in:
Jinseong Jeon
2022-05-14 23:22:54 -07:00
committed by Ilya Kirillov
parent 1fe574f406
commit c230a488e2
6 changed files with 23 additions and 16 deletions
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
import org.jetbrains.kotlin.light.classes.symbol.base.service.NullabilityAnnotationSourceProvider
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.ModuleStructureDirectives
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability
import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
@@ -29,6 +30,9 @@ import java.nio.file.Path
import kotlin.io.path.exists
import kotlin.io.path.nameWithoutExtension
// Same as LightProjectDescriptor.TEST_MODULE_NAME
private const val TEST_MODULE_NAME = "light_idea_test_case"
abstract class AbstractSymbolLightClassesTestBase(
override val configurator: AnalysisApiTestConfigurator
) : AbstractAnalysisApiBasedSingleModuleTest() {
@@ -41,6 +45,7 @@ abstract class AbstractSymbolLightClassesTestBase(
useAdditionalSourceProviders(::NullabilityAnnotationSourceProvider)
defaultDirectives {
+ConfigurationDirectives.WITH_STDLIB
ModuleStructureDirectives.MODULE + TEST_MODULE_NAME
}
}
}
@@ -26,7 +26,7 @@ public abstract class Base /* Base*/ {
public final void nv();// nv()
public int getX$main();// getX$main()
public int getX$light_idea_test_case();// getX$light_idea_test_case()
public int getY();// getY()
@@ -43,7 +43,7 @@ public final class Derived /* Derived*/ extends Base implements IntfWithProp {
public int abs();// abs()
public int getX$main();// getX$main()
public int getX$light_idea_test_case();// getX$light_idea_test_case()
}
@@ -64,7 +64,7 @@ public abstract class AnotherDerived /* AnotherDerived*/ extends Base {
public abstract void noReturn(@org.jetbrains.annotations.NotNull() java.lang.String);// noReturn(java.lang.String)
public int getX$main();// getX$main()
public int getX$light_idea_test_case();// getX$light_idea_test_case()
public int getY();// getY()
@@ -39,24 +39,24 @@ public class B /* B*/ {
public java.lang.String d;
@org.jetbrains.annotations.NotNull()
public final java.lang.String getA$main();// getA$main()
public final java.lang.String getA$light_idea_test_case();// getA$light_idea_test_case()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getB$main();// getB$main()
public final java.lang.String getB$light_idea_test_case();// getB$light_idea_test_case()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getC$main();// getC$main()
public final java.lang.String getC$light_idea_test_case();// getC$light_idea_test_case()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getD$main();// getD$main()
public final java.lang.String getD$light_idea_test_case();// getD$light_idea_test_case()
protected final void setC$main(@org.jetbrains.annotations.NotNull() java.lang.String);// setC$main(java.lang.String)
protected final void setC$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setC$light_idea_test_case(java.lang.String)
public B();// .ctor()
public final void setA$main(@org.jetbrains.annotations.NotNull() java.lang.String);// setA$main(java.lang.String)
public final void setA$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setA$light_idea_test_case(java.lang.String)
public final void setD$main(@org.jetbrains.annotations.NotNull() java.lang.String);// setD$main(java.lang.String)
public final void setD$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setD$light_idea_test_case(java.lang.String)
}
@@ -102,7 +102,7 @@ public final class Foo /* Foo*/ {
public final java.lang.String getDelegatedProp();// getDelegatedProp()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getInternalVarPrivateSet$main();// getInternalVarPrivateSet$main()
public final java.lang.String getInternalVarPrivateSet$light_idea_test_case();// getInternalVarPrivateSet$light_idea_test_case()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getLazyProp();// getLazyProp()
@@ -111,7 +111,7 @@ public final class Foo /* Foo*/ {
public final java.lang.String getName();// getName()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getStringRepresentation$main();// getStringRepresentation$main()
public final java.lang.String getStringRepresentation$light_idea_test_case();// getStringRepresentation$light_idea_test_case()
@org.jetbrains.annotations.NotNull()
public final kotlin.jvm.functions.Function1<java.lang.Integer, java.lang.Integer> getSum();// getSum()
@@ -163,7 +163,7 @@ public final class Foo /* Foo*/ {
public final int getIntProp(int);// getIntProp(int)
public final int getInternalWithPrivateSet$main();// getInternalWithPrivateSet$main()
public final int getInternalWithPrivateSet$light_idea_test_case();// getInternalWithPrivateSet$light_idea_test_case()
public final void setC(boolean);// setC(boolean)
@@ -187,7 +187,7 @@ public final class Foo /* Foo*/ {
public final void setName(@org.jetbrains.annotations.NotNull() java.lang.String);// setName(java.lang.String)
public final void setStringRepresentation$main(@org.jetbrains.annotations.NotNull() java.lang.String);// setStringRepresentation$main(java.lang.String)
public final void setStringRepresentation$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setStringRepresentation$light_idea_test_case(java.lang.String)
public final void setSubject(error.NonExistentClass);// setSubject(error.NonExistentClass)
@@ -16,7 +16,7 @@ public final class Foo /* Foo*/ {
public final int bar4();// bar4()
public final void bar2$main(error.NonExistentClass, error.NonExistentClass);// bar2$main(error.NonExistentClass, error.NonExistentClass)
public final void bar2$light_idea_test_case(error.NonExistentClass, error.NonExistentClass);// bar2$light_idea_test_case(error.NonExistentClass, error.NonExistentClass)
public void bar(int, @org.jetbrains.annotations.NotNull() java.lang.Object, @org.jetbrains.annotations.NotNull() Foo);// bar(int, java.lang.Object, Foo)
@@ -316,7 +316,9 @@ class ModuleStructureExtractorImpl(
val targetBackend = currentModuleTargetBackend ?: defaultsProvider.defaultTargetBackend
currentModuleLanguageVersionSettingsBuilder.configureUsingDirectives(moduleDirectives, environmentConfigurators, targetBackend)
val moduleName = currentModuleName ?: DEFAULT_MODULE_NAME
val moduleName = currentModuleName
?: testServices.defaultDirectives[ModuleStructureDirectives.MODULE].firstOrNull()
?: DEFAULT_MODULE_NAME
val targetPlatform = currentModuleTargetPlatform ?: parseModulePlatformByName(moduleName) ?: defaultsProvider.defaultPlatform
val testModule = TestModule(
name = moduleName,