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

[test] Give IrText test classes more descriptive names

Browse Source 
The names now reflect the frontend and the backend used to run the tests
This commit is contained in:
Sergej Jaskiewicz
2023-03-09 18:39:25 +01:00
committed by Space Team
parent b01cc1f88c
commit c1ea3e7b53
16 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrSpecificTextTestGenerated.java → compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSpecificTextTestGenerated.java
Generated
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/fir/fir2ir/testData/ir/irText") @TestMetadata("compiler/fir/fir2ir/testData/ir/irText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class FirLightTreeIrSpecificTextTestGenerated extends AbstractFirLightTreeIrTextTest { public class FirLightTreeJvmIrSpecificTextTestGenerated extends AbstractFirLightTreeJvmIrTextTest {
@Test @Test
public void testAllFilesPresentInIrText() throws Exception { public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrTextTestGenerated.java → compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java
Generated
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/ir/irText") @TestMetadata("compiler/testData/ir/irText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class FirLightTreeIrTextTestGenerated extends AbstractFirLightTreeIrTextTest { public class FirLightTreeJvmIrTextTestGenerated extends AbstractFirLightTreeJvmIrTextTest {
@Test @Test
public void testAllFilesPresentInIrText() throws Exception { public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrSpecificTextTestGenerated.java → compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSpecificTextTestGenerated.java
Generated
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/fir/fir2ir/testData/ir/irText") @TestMetadata("compiler/fir/fir2ir/testData/ir/irText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class FirPsiIrSpecificTextTestGenerated extends AbstractFirPsiIrTextTest { public class FirPsiJvmIrSpecificTextTestGenerated extends AbstractFirPsiJvmIrTextTest {
@Test @Test
public void testAllFilesPresentInIrText() throws Exception { public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java → compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java
Generated
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/ir/irText") @TestMetadata("compiler/testData/ir/irText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class IrTextTestGenerated extends AbstractIrTextTest { public class FirPsiJvmIrTextTestGenerated extends AbstractFirPsiJvmIrTextTest {
@Test @Test
public void testAllFilesPresentInIrText() throws Exception { public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrTextTestGenerated.java → compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java
Generated
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/ir/irText") @TestMetadata("compiler/testData/ir/irText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class FirPsiIrTextTestGenerated extends AbstractFirPsiIrTextTest { public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest {
@Test @Test
public void testAllFilesPresentInIrText() throws Exception { public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt
+12 -10
View File
@@ -38,8 +38,8 @@ import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsS
import org.jetbrains.kotlin.test.services.sourceProviders.CodegenHelpersSourceFilesProvider import org.jetbrains.kotlin.test.services.sourceProviders.CodegenHelpersSourceFilesProvider
import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider
abstract class AbstractIrTextTestBase<R : ResultingArtifact.FrontendOutput<R>> : abstract class AbstractIrTextTestBase<R : ResultingArtifact.FrontendOutput<R>>(targetBackend: TargetBackend) :
AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR) AbstractKotlinCompilerWithTargetBackendTest(targetBackend)
{ {
abstract val frontend: FrontendKind<*> abstract val frontend: FrontendKind<*>
abstract val frontendFacade: Constructor<FrontendFacade<R>> abstract val frontendFacade: Constructor<FrontendFacade<R>>
@@ -57,7 +57,7 @@ abstract class AbstractIrTextTestBase<R : ResultingArtifact.FrontendOutput<R>> :
frontend = this@AbstractIrTextTestBase.frontend frontend = this@AbstractIrTextTestBase.frontend
targetPlatform = JvmPlatforms.defaultJvmPlatform targetPlatform = JvmPlatforms.defaultJvmPlatform
artifactKind = BinaryKind.NoArtifact artifactKind = BinaryKind.NoArtifact
targetBackend = TargetBackend.JVM_IR targetBackend = this@AbstractIrTextTestBase.targetBackend
dependencyKind = DependencyKind.Source dependencyKind = DependencyKind.Source
} }
@@ -99,7 +99,7 @@ abstract class AbstractIrTextTestBase<R : ResultingArtifact.FrontendOutput<R>> :
} }
} }
open class AbstractIrTextTest : AbstractIrTextTestBase<ClassicFrontendOutputArtifact>() { open class AbstractClassicJvmIrTextTest : AbstractIrTextTestBase<ClassicFrontendOutputArtifact>(TargetBackend.JVM_IR) {
override val frontend: FrontendKind<*> override val frontend: FrontendKind<*>
get() = FrontendKinds.ClassicFrontend get() = FrontendKinds.ClassicFrontend
override val frontendFacade: Constructor<FrontendFacade<ClassicFrontendOutputArtifact>> override val frontendFacade: Constructor<FrontendFacade<ClassicFrontendOutputArtifact>>
@@ -117,7 +117,10 @@ open class AbstractIrTextTest : AbstractIrTextTestBase<ClassicFrontendOutputArti
} }
} }
open class AbstractFirIrTextTestBase(val parser: FirParser) : AbstractIrTextTestBase<FirOutputArtifact>() { open class AbstractFirIrTextTestBase(
val parser: FirParser,
targetBackend: TargetBackend
) : AbstractIrTextTestBase<FirOutputArtifact>(targetBackend) {
override val frontend: FrontendKind<*> override val frontend: FrontendKind<*>
get() = FrontendKinds.FIR get() = FrontendKinds.FIR
override val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>> override val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>>
@@ -143,12 +146,12 @@ open class AbstractFirIrTextTestBase(val parser: FirParser) : AbstractIrTextTest
} }
} }
open class AbstractFirLightTreeIrTextTest : AbstractFirIrTextTestBase(FirParser.LightTree) open class AbstractFirLightTreeJvmIrTextTest : AbstractFirIrTextTestBase(FirParser.LightTree, TargetBackend.JVM_IR)
@FirPsiCodegenTest @FirPsiCodegenTest
open class AbstractFirPsiIrTextTest : AbstractFirIrTextTestBase(FirParser.Psi) open class AbstractFirPsiJvmIrTextTest : AbstractFirIrTextTestBase(FirParser.Psi, TargetBackend.JVM_IR)
open class AbstractFirIrJsTextTestBase(parser: FirParser) : AbstractFirIrTextTestBase(parser) { open class AbstractFirJsIrTextTestBase(parser: FirParser) : AbstractFirIrTextTestBase(parser, TargetBackend.JS_IR) {
override fun TestConfigurationBuilder.applyConfigurators() { override fun TestConfigurationBuilder.applyConfigurators() {
useConfigurators( useConfigurators(
::CommonEnvironmentConfigurator, ::CommonEnvironmentConfigurator,
@@ -164,11 +167,10 @@ open class AbstractFirIrJsTextTestBase(parser: FirParser) : AbstractFirIrTextTes
globalDefaults { globalDefaults {
targetPlatform = JsPlatforms.defaultJsPlatform targetPlatform = JsPlatforms.defaultJsPlatform
artifactKind = BinaryKind.NoArtifact artifactKind = BinaryKind.NoArtifact
targetBackend = TargetBackend.JS_IR
dependencyKind = DependencyKind.Source dependencyKind = DependencyKind.Source
} }
} }
} }
} }
open class AbstractFirLightTreeIrJsTextTest : AbstractFirIrJsTextTestBase(FirParser.LightTree) open class AbstractFirLightTreeJsIrTextTest : AbstractFirJsIrTextTestBase(FirParser.LightTree)
compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrJsTextTestCase.kt → compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractClassicJsIrTextTestCase.kt
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
abstract class AbstractIrJsTextTestCase : AbstractIrTextTestCase() { abstract class AbstractClassicJsIrTextTestCase : AbstractIrTextTestCase() {
override fun doGenerateIrModule(psi2IrTranslator: Psi2IrTranslator): IrModuleFragment = override fun doGenerateIrModule(psi2IrTranslator: Psi2IrTranslator): IrModuleFragment =
generateIrModuleWithJsResolve(myFiles.psiFiles, myEnvironment, psi2IrTranslator) generateIrModuleWithJsResolve(myFiles.psiFiles, myEnvironment, psi2IrTranslator)
} }
compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt → compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt
+2 -2
View File
@@ -62,7 +62,7 @@ import java.util.*
/** /**
* Compares compiled and deserialized IR * Compares compiled and deserialized IR
*/ */
abstract class AbstractKlibTextTestCase : CodegenTestCase() { abstract class AbstractKlibIrTextTestCase : CodegenTestCase() {
companion object { companion object {
val SKIP_KLIB_TEST = Regex("""// SKIP_KLIB_TEST""") val SKIP_KLIB_TEST = Regex("""// SKIP_KLIB_TEST""")
@@ -297,4 +297,4 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() {
} }
} }
abstract class AbstractKlibJsTextTestCase : AbstractKlibTextTestCase() abstract class AbstractKlibJsIrTextTestCase : AbstractKlibIrTextTestCase()
compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
+6 -6
View File
@@ -29,15 +29,15 @@ import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS_WITHOUT_
import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME
import org.jetbrains.kotlin.integration.AbstractAntTaskTest import org.jetbrains.kotlin.integration.AbstractAntTaskTest
import org.jetbrains.kotlin.ir.AbstractIrCfgTestCase import org.jetbrains.kotlin.ir.AbstractIrCfgTestCase
import org.jetbrains.kotlin.ir.AbstractIrJsTextTestCase import org.jetbrains.kotlin.ir.AbstractClassicJsIrTextTestCase
import org.jetbrains.kotlin.ir.AbstractIrSourceRangesTestCase import org.jetbrains.kotlin.ir.AbstractIrSourceRangesTestCase
import org.jetbrains.kotlin.jvm.compiler.* import org.jetbrains.kotlin.jvm.compiler.*
import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileJavaAgainstKotlinTest import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileJavaAgainstKotlinTest
import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileKotlinAgainstJavaTest import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileKotlinAgainstJavaTest
import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrLoadJavaTest import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrLoadJavaTest
import org.jetbrains.kotlin.jvm.compiler.javac.AbstractLoadJavaUsingJavacTest import org.jetbrains.kotlin.jvm.compiler.javac.AbstractLoadJavaUsingJavacTest
import org.jetbrains.kotlin.klib.AbstractKlibJsTextTestCase import org.jetbrains.kotlin.klib.AbstractKlibJsIrTextTestCase
import org.jetbrains.kotlin.klib.AbstractKlibTextTestCase import org.jetbrains.kotlin.klib.AbstractKlibIrTextTestCase
import org.jetbrains.kotlin.lexer.kdoc.AbstractKDocLexerTest import org.jetbrains.kotlin.lexer.kdoc.AbstractKDocLexerTest
import org.jetbrains.kotlin.lexer.kotlin.AbstractKotlinLexerTest import org.jetbrains.kotlin.lexer.kotlin.AbstractKotlinLexerTest
import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest
@@ -116,15 +116,15 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
model("codegen/customScript", pattern = "^(.*)$") model("codegen/customScript", pattern = "^(.*)$")
} }
testClass<AbstractIrJsTextTestCase> { testClass<AbstractClassicJsIrTextTestCase> {
model("ir/irJsText", pattern = "^(.+)\\.kt(s)?\$") model("ir/irJsText", pattern = "^(.+)\\.kt(s)?\$")
} }
testClass<AbstractKlibJsTextTestCase> { testClass<AbstractKlibJsIrTextTestCase> {
model("ir/irJsText", pattern = "^(.+)\\.kt\$", targetBackend = TargetBackend.JS_IR) model("ir/irJsText", pattern = "^(.+)\\.kt\$", targetBackend = TargetBackend.JS_IR)
} }
testClass<AbstractKlibTextTestCase> { testClass<AbstractKlibIrTextTestCase> {
model("ir/irText", pattern = "^(.+)\\.kt\$", targetBackend = TargetBackend.JS_IR) model("ir/irText", pattern = "^(.+)\\.kt\$", targetBackend = TargetBackend.JS_IR)
} }
compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
+7 -7
View File
@@ -128,7 +128,7 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
model("codegen/box/compileKotlinAgainstKotlin") model("codegen/box/compileKotlinAgainstKotlin")
} }
testClass<AbstractIrTextTest> { testClass<AbstractClassicJvmIrTextTest> {
model("ir/irText") model("ir/irText")
} }
@@ -354,14 +354,14 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
model("codegen/boxWithStdLib") model("codegen/boxWithStdLib")
} }
testClass<AbstractFirLightTreeIrTextTest>( testClass<AbstractFirLightTreeJvmIrTextTest>(
suiteTestClassName = "FirLightTreeIrSpecificTextTestGenerated" suiteTestClassName = "FirLightTreeJvmIrSpecificTextTestGenerated"
) { ) {
model("ir/irText") model("ir/irText")
} }
testClass<AbstractFirPsiIrTextTest>( testClass<AbstractFirPsiJvmIrTextTest>(
suiteTestClassName = "FirPsiIrSpecificTextTestGenerated" suiteTestClassName = "FirPsiJvmIrSpecificTextTestGenerated"
) { ) {
model("ir/irText") model("ir/irText")
} }
@@ -392,11 +392,11 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
} }
testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") { testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") {
testClass<AbstractFirLightTreeIrTextTest> { testClass<AbstractFirLightTreeJvmIrTextTest> {
model("ir/irText") model("ir/irText")
} }
testClass<AbstractFirPsiIrTextTest> { testClass<AbstractFirPsiJvmIrTextTest> {
model("ir/irText") model("ir/irText")
} }
compiler/tests-gen/org/jetbrains/kotlin/ir/IrJsTextTestCaseGenerated.java → compiler/tests-gen/org/jetbrains/kotlin/ir/ClassicJsIrTextTestCaseGenerated.java
Generated
+4 -4
View File
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
@TestMetadata("compiler/testData/ir/irJsText") @TestMetadata("compiler/testData/ir/irJsText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class IrJsTextTestCaseGenerated extends AbstractIrJsTextTestCase { public class ClassicJsIrTextTestCaseGenerated extends AbstractClassicJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
} }
@@ -32,7 +32,7 @@ public class IrJsTextTestCaseGenerated extends AbstractIrJsTextTestCase {
@TestMetadata("compiler/testData/ir/irJsText/dynamic") @TestMetadata("compiler/testData/ir/irJsText/dynamic")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Dynamic extends AbstractIrJsTextTestCase { public static class Dynamic extends AbstractClassicJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
} }
@@ -155,7 +155,7 @@ public class IrJsTextTestCaseGenerated extends AbstractIrJsTextTestCase {
@TestMetadata("compiler/testData/ir/irJsText/external") @TestMetadata("compiler/testData/ir/irJsText/external")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class External extends AbstractIrJsTextTestCase { public static class External extends AbstractClassicJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
} }
@@ -173,7 +173,7 @@ public class IrJsTextTestCaseGenerated extends AbstractIrJsTextTestCase {
@TestMetadata("compiler/testData/ir/irJsText/native") @TestMetadata("compiler/testData/ir/irJsText/native")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Native extends AbstractIrJsTextTestCase { public static class Native extends AbstractClassicJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
} }
compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.java → compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java
Generated
+25 -25
View File
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
@TestMetadata("compiler/testData/ir/irText") @TestMetadata("compiler/testData/ir/irText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase { public class KlibIrTextTestCaseGenerated extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -33,7 +33,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/classes") @TestMetadata("compiler/testData/ir/irText/classes")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Classes extends AbstractKlibTextTestCase { public static class Classes extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -245,7 +245,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/classes/dataClasses") @TestMetadata("compiler/testData/ir/irText/classes/dataClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class DataClasses extends AbstractKlibTextTestCase { public static class DataClasses extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -299,7 +299,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations") @TestMetadata("compiler/testData/ir/irText/declarations")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Declarations extends AbstractKlibTextTestCase { public static class Declarations extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -431,7 +431,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations/annotations") @TestMetadata("compiler/testData/ir/irText/declarations/annotations")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Annotations extends AbstractKlibTextTestCase { public static class Annotations extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -609,7 +609,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations/contextReceivers") @TestMetadata("compiler/testData/ir/irText/declarations/contextReceivers")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class ContextReceivers extends AbstractKlibTextTestCase { public static class ContextReceivers extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -686,7 +686,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP") @TestMetadata("compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class FromKEEP extends AbstractKlibTextTestCase { public static class FromKEEP extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -700,7 +700,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations/jvmRecord") @TestMetadata("compiler/testData/ir/irText/declarations/jvmRecord")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class JvmRecord extends AbstractKlibTextTestCase { public static class JvmRecord extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -713,7 +713,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations/multiplatform") @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Multiplatform extends AbstractKlibTextTestCase { public static class Multiplatform extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -746,7 +746,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations/parameters") @TestMetadata("compiler/testData/ir/irText/declarations/parameters")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Parameters extends AbstractKlibTextTestCase { public static class Parameters extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -824,7 +824,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/declarations/provideDelegate") @TestMetadata("compiler/testData/ir/irText/declarations/provideDelegate")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class ProvideDelegate extends AbstractKlibTextTestCase { public static class ProvideDelegate extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -868,7 +868,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/errors") @TestMetadata("compiler/testData/ir/irText/errors")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Errors extends AbstractKlibTextTestCase { public static class Errors extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -891,7 +891,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/expressions") @TestMetadata("compiler/testData/ir/irText/expressions")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Expressions extends AbstractKlibTextTestCase { public static class Expressions extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -1613,7 +1613,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/expressions/callableReferences") @TestMetadata("compiler/testData/ir/irText/expressions/callableReferences")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class CallableReferences extends AbstractKlibTextTestCase { public static class CallableReferences extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -1726,7 +1726,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/expressions/floatingPointComparisons") @TestMetadata("compiler/testData/ir/irText/expressions/floatingPointComparisons")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class FloatingPointComparisons extends AbstractKlibTextTestCase { public static class FloatingPointComparisons extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -1794,7 +1794,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/expressions/funInterface") @TestMetadata("compiler/testData/ir/irText/expressions/funInterface")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class FunInterface extends AbstractKlibTextTestCase { public static class FunInterface extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -1852,7 +1852,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/expressions/sam") @TestMetadata("compiler/testData/ir/irText/expressions/sam")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Sam extends AbstractKlibTextTestCase { public static class Sam extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -1866,7 +1866,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/firProblems") @TestMetadata("compiler/testData/ir/irText/firProblems")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class FirProblems extends AbstractKlibTextTestCase { public static class FirProblems extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -2054,7 +2054,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/lambdas") @TestMetadata("compiler/testData/ir/irText/lambdas")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Lambdas extends AbstractKlibTextTestCase { public static class Lambdas extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -2107,7 +2107,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/regressions") @TestMetadata("compiler/testData/ir/irText/regressions")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Regressions extends AbstractKlibTextTestCase { public static class Regressions extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -2150,7 +2150,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/singletons") @TestMetadata("compiler/testData/ir/irText/singletons")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Singletons extends AbstractKlibTextTestCase { public static class Singletons extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -2178,7 +2178,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/stubs") @TestMetadata("compiler/testData/ir/irText/stubs")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Stubs extends AbstractKlibTextTestCase { public static class Stubs extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -2216,7 +2216,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/types") @TestMetadata("compiler/testData/ir/irText/types")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Types extends AbstractKlibTextTestCase { public static class Types extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -2358,7 +2358,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/types/nullChecks") @TestMetadata("compiler/testData/ir/irText/types/nullChecks")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class NullChecks extends AbstractKlibTextTestCase { public static class NullChecks extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -2370,7 +2370,7 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase {
@TestMetadata("compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult") @TestMetadata("compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class NullCheckOnLambdaResult extends AbstractKlibTextTestCase { public static class NullCheckOnLambdaResult extends AbstractKlibIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
compiler/tests-gen/org/jetbrains/kotlin/klib/KlibJsTextTestCaseGenerated.java → compiler/tests-gen/org/jetbrains/kotlin/klib/KlibJsIrTextTestCaseGenerated.java
Generated
+4 -4
View File
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
@TestMetadata("compiler/testData/ir/irJsText") @TestMetadata("compiler/testData/ir/irJsText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class KlibJsTextTestCaseGenerated extends AbstractKlibJsTextTestCase { public class KlibJsIrTextTestCaseGenerated extends AbstractKlibJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -33,7 +33,7 @@ public class KlibJsTextTestCaseGenerated extends AbstractKlibJsTextTestCase {
@TestMetadata("compiler/testData/ir/irJsText/dynamic") @TestMetadata("compiler/testData/ir/irJsText/dynamic")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Dynamic extends AbstractKlibJsTextTestCase { public static class Dynamic extends AbstractKlibJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -156,7 +156,7 @@ public class KlibJsTextTestCaseGenerated extends AbstractKlibJsTextTestCase {
@TestMetadata("compiler/testData/ir/irJsText/external") @TestMetadata("compiler/testData/ir/irJsText/external")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class External extends AbstractKlibJsTextTestCase { public static class External extends AbstractKlibJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
@@ -174,7 +174,7 @@ public class KlibJsTextTestCaseGenerated extends AbstractKlibJsTextTestCase {
@TestMetadata("compiler/testData/ir/irJsText/native") @TestMetadata("compiler/testData/ir/irJsText/native")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Native extends AbstractKlibJsTextTestCase { public static class Native extends AbstractKlibJsIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath);
} }
js/js.tests/build.gradle.kts
-1
View File
@@ -258,7 +258,6 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean, firEnabled: B
when { when {
firEnabled -> { firEnabled -> {
include("org/jetbrains/kotlin/js/test/fir/*") include("org/jetbrains/kotlin/js/test/fir/*")
include("org/jetbrains/kotlin/test/runners/ir/Fir2IrJsTextTestGenerated.class")
} }
es6Enabled -> { es6Enabled -> {
include("org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.class") include("org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.class")
js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+2 -2
View File
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.js.test.ir.*
import org.jetbrains.kotlin.js.testOld.AbstractDceTest import org.jetbrains.kotlin.js.testOld.AbstractDceTest
import org.jetbrains.kotlin.js.testOld.compatibility.binary.AbstractJsKlibBinaryCompatibilityTest import org.jetbrains.kotlin.js.testOld.compatibility.binary.AbstractJsKlibBinaryCompatibilityTest
import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.runners.ir.AbstractFirLightTreeIrJsTextTest import org.jetbrains.kotlin.test.runners.ir.AbstractFirLightTreeJsIrTextTest
fun main(args: Array<String>) { fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true") System.setProperty("java.awt.headless", "true")
@@ -179,7 +179,7 @@ fun main(args: Array<String>) {
model("diagnostics/testsWithJsStdLib", pattern = "^([^_](.+))\\.kt$", excludedPattern = excludedFirTestdataPattern) model("diagnostics/testsWithJsStdLib", pattern = "^([^_](.+))\\.kt$", excludedPattern = excludedFirTestdataPattern)
} }
testClass<AbstractFirLightTreeIrJsTextTest>( testClass<AbstractFirLightTreeJsIrTextTest>(
suiteTestClassName = "FirLightTreeJsIrTextTestGenerated" suiteTestClassName = "FirLightTreeJsIrTextTestGenerated"
) { ) {
model("ir/irJsText") model("ir/irJsText")
js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJsIrTextTestGenerated.java
Generated
+5 -5
View File
@@ -19,10 +19,10 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/ir/irJsText") @TestMetadata("compiler/testData/ir/irJsText")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeIrJsTextTest { public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrTextTest {
@Test @Test
public void testAllFilesPresentInIrJsText() throws Exception { public void testAllFilesPresentInIrJsText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
} }
@Nested @Nested
@@ -31,7 +31,7 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeIrJsT
public class Dynamic { public class Dynamic {
@Test @Test
public void testAllFilesPresentInDynamic() throws Exception { public void testAllFilesPresentInDynamic() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText/dynamic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText/dynamic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
} }
@Test @Test
@@ -173,7 +173,7 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeIrJsT
public class External { public class External {
@Test @Test
public void testAllFilesPresentInExternal() throws Exception { public void testAllFilesPresentInExternal() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText/external"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText/external"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
} }
@Test @Test
@@ -189,7 +189,7 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeIrJsT
public class Native { public class Native {
@Test @Test
public void testAllFilesPresentInNative() throws Exception { public void testAllFilesPresentInNative() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText/native"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText/native"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
} }
@Test @Test