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

[K2/N] Rewrite mpp tests from old native infra to new

Browse Source 
^KT-58543

Merge-request: KT-MR-10065
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
Vladimir Sukharev
2023-05-16 08:41:39 +00:00
committed by Space Team
parent 2b913d7c47
commit bbe1e708f9
35 changed files with 2067 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
Generated
+80
View File
@@ -26720,6 +26720,86 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests")
@TestDataPath("$PROJECT_ROOT")
@Tag("frontend-fir")
@FirPipeline()
@UseExtTestCaseGroupProvider()
public class MigratedOldTests {
@Test
public void testAllFilesPresentInMigratedOldTests() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("mpp1.kt")
public void testMpp1() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt");
}
@Test
@TestMetadata("mpp2.kt")
public void testMpp2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt");
}
@Test
@TestMetadata("mpp_default_args.kt")
public void testMpp_default_args() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt");
}
@Test
@TestMetadata("mpp_optional_expectation.kt")
public void testMpp_optional_expectation() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt");
}
@Test
@TestMetadata("remap_expect_property_ref.kt")
public void testRemap_expect_property_ref() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt");
}
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests")
@TestDataPath("$PROJECT_ROOT")
@Tag("frontend-fir")
@FirPipeline()
@UseExtTestCaseGroupProvider()
public class MigratedOldTests {
@Test
public void testAllFilesPresentInMigratedOldTests() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("mpp1.kt")
public void testMpp1() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp1.kt");
}
@Test
@TestMetadata("mpp2.kt")
public void testMpp2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp2.kt");
}
@Test
@TestMetadata("mpp_default_args.kt")
public void testMpp_default_args() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp_default_args.kt");
}
@Test
@TestMetadata("remap_expect_property_ref.kt")
public void testRemap_expect_property_ref() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/remap_expect_property_ref.kt");
}
}
@Nested
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+84
View File
@@ -27328,6 +27328,90 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests")
@TestDataPath("$PROJECT_ROOT")
@Tag("frontend-fir")
@FirPipeline()
@UseExtTestCaseGroupProvider()
@UsePartialLinkage(mode = Mode.DISABLED)
@Tag("no-partial-linkage-may-be-skipped")
public class MigratedOldTests {
@Test
public void testAllFilesPresentInMigratedOldTests() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("mpp1.kt")
public void testMpp1() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt");
}
@Test
@TestMetadata("mpp2.kt")
public void testMpp2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt");
}
@Test
@TestMetadata("mpp_default_args.kt")
public void testMpp_default_args() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt");
}
@Test
@TestMetadata("mpp_optional_expectation.kt")
public void testMpp_optional_expectation() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt");
}
@Test
@TestMetadata("remap_expect_property_ref.kt")
public void testRemap_expect_property_ref() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt");
}
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests")
@TestDataPath("$PROJECT_ROOT")
@Tag("frontend-fir")
@FirPipeline()
@UseExtTestCaseGroupProvider()
@UsePartialLinkage(mode = Mode.DISABLED)
@Tag("no-partial-linkage-may-be-skipped")
public class MigratedOldTests {
@Test
public void testAllFilesPresentInMigratedOldTests() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("mpp1.kt")
public void testMpp1() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp1.kt");
}
@Test
@TestMetadata("mpp2.kt")
public void testMpp2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp2.kt");
}
@Test
@TestMetadata("mpp_default_args.kt")
public void testMpp_default_args() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp_default_args.kt");
}
@Test
@TestMetadata("remap_expect_property_ref.kt")
public void testRemap_expect_property_ref() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/remap_expect_property_ref.kt");
}
}
@Nested
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+681 -603
View File
File diff suppressed because it is too large Load Diff
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
Generated
+80
View File
@@ -26721,6 +26721,86 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests")
@TestDataPath("$PROJECT_ROOT")
@UseExtTestCaseGroupProvider()
@UsePartialLinkage(mode = Mode.DISABLED)
@Tag("no-partial-linkage-may-be-skipped")
public class MigratedOldTests {
@Test
public void testAllFilesPresentInMigratedOldTests() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("mpp1.kt")
public void testMpp1() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt");
}
@Test
@TestMetadata("mpp2.kt")
public void testMpp2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt");
}
@Test
@TestMetadata("mpp_default_args.kt")
public void testMpp_default_args() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt");
}
@Test
@TestMetadata("mpp_optional_expectation.kt")
public void testMpp_optional_expectation() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt");
}
@Test
@TestMetadata("remap_expect_property_ref.kt")
public void testRemap_expect_property_ref() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt");
}
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests")
@TestDataPath("$PROJECT_ROOT")
@UseExtTestCaseGroupProvider()
@UsePartialLinkage(mode = Mode.DISABLED)
@Tag("no-partial-linkage-may-be-skipped")
public class MigratedOldTests {
@Test
public void testAllFilesPresentInMigratedOldTests() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("mpp1.kt")
public void testMpp1() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp1.kt");
}
@Test
@TestMetadata("mpp2.kt")
public void testMpp2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp2.kt");
}
@Test
@TestMetadata("mpp_default_args.kt")
public void testMpp_default_args() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/mpp_default_args.kt");
}
@Test
@TestMetadata("remap_expect_property_ref.kt")
public void testRemap_expect_property_ref() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/migratedOldTests/remap_expect_property_ref.kt");
}
}
@Nested
native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
+1
View File
@@ -33,6 +33,7 @@ fun main() {
disabledInOneStageMode(
"codegen/box/coroutines/featureIntersection/defaultExpect.kt",
"codegen/box/multiplatform/defaultArguments/*.kt",
"codegen/box/multiplatform/migratedOldTests/*.kt",
"codegen/boxInline/multiplatform/defaultArguments/receiversAndParametersInLambda.kt"
)
)