[Test] Add JVM platform to name of ..FirLoadCompiledKotlin.. tests
This is needed for further distinguishing them with similar JS tests
This commit is contained in:
committed by
Space Team
parent
d5831587fb
commit
2290a096d1
+3
-3
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact
|
|||||||
import org.jetbrains.kotlin.test.model.*
|
import org.jetbrains.kotlin.test.model.*
|
||||||
import org.jetbrains.kotlin.test.runners.codegen.commonConfigurationForTest
|
import org.jetbrains.kotlin.test.runners.codegen.commonConfigurationForTest
|
||||||
|
|
||||||
abstract class AbstractFirLoadCompiledKotlinTestBase<F : ResultingArtifact.FrontendOutput<F>> :
|
abstract class AbstractFirLoadCompiledJvmKotlinTestBase<F : ResultingArtifact.FrontendOutput<F>> :
|
||||||
AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR)
|
AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR)
|
||||||
{
|
{
|
||||||
protected abstract val frontendKind: FrontendKind<F>
|
protected abstract val frontendKind: FrontendKind<F>
|
||||||
@@ -50,7 +50,7 @@ abstract class AbstractFirLoadCompiledKotlinTestBase<F : ResultingArtifact.Front
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open class AbstractFirLoadK1CompiledKotlin : AbstractFirLoadCompiledKotlinTestBase<ClassicFrontendOutputArtifact>() {
|
open class AbstractFirLoadK1CompiledJvmKotlinTest : AbstractFirLoadCompiledJvmKotlinTestBase<ClassicFrontendOutputArtifact>() {
|
||||||
override val frontendKind: FrontendKind<ClassicFrontendOutputArtifact>
|
override val frontendKind: FrontendKind<ClassicFrontendOutputArtifact>
|
||||||
get() = FrontendKinds.ClassicFrontend
|
get() = FrontendKinds.ClassicFrontend
|
||||||
override val frontendFacade: Constructor<FrontendFacade<ClassicFrontendOutputArtifact>>
|
override val frontendFacade: Constructor<FrontendFacade<ClassicFrontendOutputArtifact>>
|
||||||
@@ -59,7 +59,7 @@ open class AbstractFirLoadK1CompiledKotlin : AbstractFirLoadCompiledKotlinTestBa
|
|||||||
get() = ::ClassicFrontend2IrConverter
|
get() = ::ClassicFrontend2IrConverter
|
||||||
}
|
}
|
||||||
|
|
||||||
open class AbstractFirLoadK2CompiledKotlin : AbstractFirLoadCompiledKotlinTestBase<FirOutputArtifact>() {
|
open class AbstractFirLoadK2CompiledJvmKotlinTest : AbstractFirLoadCompiledJvmKotlinTestBase<FirOutputArtifact>() {
|
||||||
override val frontendKind: FrontendKind<FirOutputArtifact>
|
override val frontendKind: FrontendKind<FirOutputArtifact>
|
||||||
get() = FrontendKinds.FIR
|
get() = FrontendKinds.FIR
|
||||||
override val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>>
|
override val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>>
|
||||||
+1
-1
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
|
|||||||
|
|
||||||
/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
|
/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
|
||||||
@SuppressWarnings("all")
|
@SuppressWarnings("all")
|
||||||
public class FirLoadK1CompiledKotlinGenerated extends AbstractFirLoadK1CompiledKotlin {
|
public class FirLoadK1CompiledJvmKotlinTestGenerated extends AbstractFirLoadK1CompiledJvmKotlinTest {
|
||||||
@Nested
|
@Nested
|
||||||
@TestMetadata("compiler/testData/loadJava/compiledKotlin")
|
@TestMetadata("compiler/testData/loadJava/compiledKotlin")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
+1
-1
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
|
|||||||
|
|
||||||
/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
|
/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
|
||||||
@SuppressWarnings("all")
|
@SuppressWarnings("all")
|
||||||
public class FirLoadK2CompiledKotlinGenerated extends AbstractFirLoadK2CompiledKotlin {
|
public class FirLoadK2CompiledJvmKotlinTestGenerated extends AbstractFirLoadK2CompiledJvmKotlinTest {
|
||||||
@Nested
|
@Nested
|
||||||
@TestMetadata("compiler/testData/loadJava/compiledKotlin")
|
@TestMetadata("compiler/testData/loadJava/compiledKotlin")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
+2
-2
@@ -265,12 +265,12 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
|
testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
|
||||||
testClass<AbstractFirLoadK1CompiledKotlin> {
|
testClass<AbstractFirLoadK1CompiledJvmKotlinTest> {
|
||||||
model("loadJava/compiledKotlin", extension = "kt")
|
model("loadJava/compiledKotlin", extension = "kt")
|
||||||
model("loadJava/compiledKotlinWithStdlib", extension = "kt")
|
model("loadJava/compiledKotlinWithStdlib", extension = "kt")
|
||||||
}
|
}
|
||||||
|
|
||||||
testClass<AbstractFirLoadK2CompiledKotlin> {
|
testClass<AbstractFirLoadK2CompiledJvmKotlinTest> {
|
||||||
model("loadJava/compiledKotlin", extension = "kt")
|
model("loadJava/compiledKotlin", extension = "kt")
|
||||||
model("loadJava/compiledKotlinWithStdlib", extension = "kt")
|
model("loadJava/compiledKotlinWithStdlib", extension = "kt")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.assignment.plugin.AbstractFirLightTreeBlackBoxCodege
|
|||||||
import org.jetbrains.kotlin.assignment.plugin.AbstractFirPsiAssignmentPluginDiagnosticTest
|
import org.jetbrains.kotlin.assignment.plugin.AbstractFirPsiAssignmentPluginDiagnosticTest
|
||||||
import org.jetbrains.kotlin.assignment.plugin.AbstractIrBlackBoxCodegenTestAssignmentPlugin
|
import org.jetbrains.kotlin.assignment.plugin.AbstractIrBlackBoxCodegenTestAssignmentPlugin
|
||||||
import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLightTreePluginBlackBoxCodegenTest
|
import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLightTreePluginBlackBoxCodegenTest
|
||||||
import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLoadK2CompiledKotlinWithPluginTest
|
import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLoadK2CompiledWithPluginJvmKotlinTest
|
||||||
import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPsiPluginDiagnosticTest
|
import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPsiPluginDiagnosticTest
|
||||||
import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
|
import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
|
||||||
import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite
|
import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite
|
||||||
@@ -262,7 +262,7 @@ fun main(args: Array<String>) {
|
|||||||
model("box")
|
model("box")
|
||||||
}
|
}
|
||||||
|
|
||||||
testClass<AbstractFirLoadK2CompiledKotlinWithPluginTest> {
|
testClass<AbstractFirLoadK2CompiledWithPluginJvmKotlinTest> {
|
||||||
model("firLoadK2Compiled")
|
model("firLoadK2Compiled")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
|
|||||||
@SuppressWarnings("all")
|
@SuppressWarnings("all")
|
||||||
@TestMetadata("plugins/fir-plugin-prototype/testData/firLoadK2Compiled")
|
@TestMetadata("plugins/fir-plugin-prototype/testData/firLoadK2Compiled")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
public class FirLoadK2CompiledKotlinWithPluginTestGenerated extends AbstractFirLoadK2CompiledKotlinWithPluginTest {
|
public class FirLoadK2CompiledWithPluginJvmKotlinTestGenerated extends AbstractFirLoadK2CompiledWithPluginJvmKotlinTest {
|
||||||
@Test
|
@Test
|
||||||
public void testAllFilesPresentInFirLoadK2Compiled() throws Exception {
|
public void testAllFilesPresentInFirLoadK2Compiled() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/firLoadK2Compiled"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/firLoadK2Compiled"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||||
+2
-2
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.plugin.services.PluginAnnotationsProvider
|
|||||||
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
||||||
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
|
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
|
||||||
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
|
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
|
||||||
import org.jetbrains.kotlin.test.runners.AbstractFirLoadK2CompiledKotlin
|
import org.jetbrains.kotlin.test.runners.AbstractFirLoadK2CompiledJvmKotlinTest
|
||||||
import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest
|
import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest
|
||||||
import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest
|
import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest
|
||||||
import org.jetbrains.kotlin.test.runners.enableLazyResolvePhaseChecking
|
import org.jetbrains.kotlin.test.runners.enableLazyResolvePhaseChecking
|
||||||
@@ -29,7 +29,7 @@ abstract class AbstractFirPsiPluginDiagnosticTest : AbstractFirPsiDiagnosticTest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open class AbstractFirLoadK2CompiledKotlinWithPluginTest : AbstractFirLoadK2CompiledKotlin() {
|
open class AbstractFirLoadK2CompiledWithPluginJvmKotlinTest : AbstractFirLoadK2CompiledJvmKotlinTest() {
|
||||||
override fun configure(builder: TestConfigurationBuilder) {
|
override fun configure(builder: TestConfigurationBuilder) {
|
||||||
super.configure(builder)
|
super.configure(builder)
|
||||||
builder.commonFirWithPluginFrontendConfiguration()
|
builder.commonFirWithPluginFrontendConfiguration()
|
||||||
|
|||||||
Reference in New Issue
Block a user