[K/N] Remove K1 prefix from native tests

Merge-request: KT-MR-9424
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
Vladimir Sukharev
2023-03-31 21:07:26 +00:00
committed by Space Team
parent b7d0209e4b
commit 4b289e89c5
6 changed files with 10 additions and 10 deletions
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all") @SuppressWarnings("all")
public class K1InfrastructureTestGenerated extends AbstractNativeBlackBoxTest { public class InfrastructureTestGenerated extends AbstractNativeBlackBoxTest {
@Nested @Nested
@TestMetadata("native/native.tests/testData/samples") @TestMetadata("native/native.tests/testData/samples")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
@TestMetadata("compiler/testData/binaryCompatibility/klibEvolution") @TestMetadata("compiler/testData/binaryCompatibility/klibEvolution")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@Tag("k1KlibCompatibility") @Tag("k1KlibCompatibility")
public class K1KlibBinaryCompatibilityTestGenerated extends AbstractNativeKlibBinaryCompatibilityTest { public class KlibBinaryCompatibilityTestGenerated extends AbstractNativeKlibBinaryCompatibilityTest {
@Test @Test
@TestMetadata("addAbstractMemberBody.kt") @TestMetadata("addAbstractMemberBody.kt")
public void testAddAbstractMemberBody() throws Exception { public void testAddAbstractMemberBody() throws Exception {
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all") @SuppressWarnings("all")
public class K1NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest { public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest {
@Nested @Nested
@TestMetadata("compiler/testData/codegen/box") @TestMetadata("compiler/testData/codegen/box")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
@TestMetadata("native/native.tests/testData/klibContents") @TestMetadata("native/native.tests/testData/klibContents")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@Tag("k1libContents") @Tag("k1libContents")
public class K1NativeKLibContentsTestGenerated extends AbstractNativeKlibContentsTest { public class NativeKLibContentsTestGenerated extends AbstractNativeKlibContentsTest {
@Test @Test
public void testAllFilesPresentInKlibContents() throws Exception { public void testAllFilesPresentInKlibContents() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents"), Pattern.compile("^([^_](.+)).kt$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents"), Pattern.compile("^([^_](.+)).kt$"), null, true);
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/klibABI") @TestMetadata("compiler/testData/klibABI")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class K1NativePartialLinkageTestGenerated extends AbstractNativePartialLinkageTest { public class NativePartialLinkageTestGenerated extends AbstractNativePartialLinkageTest {
@Test @Test
@TestMetadata("addEnumEntry") @TestMetadata("addEnumEntry")
public void testAddEnumEntry() throws Exception { public void testAddEnumEntry() throws Exception {
@@ -24,7 +24,7 @@ fun main() {
// Codegen box tests. // Codegen box tests.
testGroup("native/native.tests/tests-gen", "compiler/testData") { testGroup("native/native.tests/tests-gen", "compiler/testData") {
testClass<AbstractNativeCodegenBoxTest>( testClass<AbstractNativeCodegenBoxTest>(
suiteTestClassName = "K1NativeCodegenBoxTestGenerated", suiteTestClassName = "NativeCodegenBoxTestGenerated",
annotations = listOf(codegen(), k1Codegen(), provider<UseExtTestCaseGroupProvider>()) annotations = listOf(codegen(), k1Codegen(), provider<UseExtTestCaseGroupProvider>())
) { ) {
model("codegen/box", targetBackend = TargetBackend.NATIVE) model("codegen/box", targetBackend = TargetBackend.NATIVE)
@@ -45,7 +45,7 @@ fun main() {
// Samples (how to utilize the abilities of new test infrastructure). // Samples (how to utilize the abilities of new test infrastructure).
testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
testClass<AbstractNativeBlackBoxTest>( testClass<AbstractNativeBlackBoxTest>(
suiteTestClassName = "K1InfrastructureTestGenerated", suiteTestClassName = "InfrastructureTestGenerated",
annotations = listOf(infrastructure(), k1Infrastructure(), provider<UseStandardTestCaseGroupProvider>()) annotations = listOf(infrastructure(), k1Infrastructure(), provider<UseStandardTestCaseGroupProvider>())
) { ) {
model("samples") model("samples")
@@ -56,7 +56,7 @@ fun main() {
// Partial linkage tests. // Partial linkage tests.
testGroup("native/native.tests/tests-gen", "compiler/testData") { testGroup("native/native.tests/tests-gen", "compiler/testData") {
testClass<AbstractNativePartialLinkageTest>( testClass<AbstractNativePartialLinkageTest>(
suiteTestClassName = "K1NativePartialLinkageTestGenerated" suiteTestClassName = "NativePartialLinkageTestGenerated"
) { ) {
model("klibABI/", pattern = "^([^_](.+))$", recursive = false) model("klibABI/", pattern = "^([^_](.+))$", recursive = false)
} }
@@ -71,7 +71,7 @@ fun main() {
// KLIB binary compatibility tests. // KLIB binary compatibility tests.
testGroup("native/native.tests/tests-gen", "compiler/testData") { testGroup("native/native.tests/tests-gen", "compiler/testData") {
testClass<AbstractNativeKlibBinaryCompatibilityTest>( testClass<AbstractNativeKlibBinaryCompatibilityTest>(
suiteTestClassName = "K1KlibBinaryCompatibilityTestGenerated", suiteTestClassName = "KlibBinaryCompatibilityTestGenerated",
annotations = listOf(k1KLibCompatibility()) annotations = listOf(k1KLibCompatibility())
) { ) {
model("binaryCompatibility/klibEvolution", recursive = false) model("binaryCompatibility/klibEvolution", recursive = false)
@@ -111,7 +111,7 @@ fun main() {
// Klib contents tests // Klib contents tests
testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
testClass<AbstractNativeKlibContentsTest>( testClass<AbstractNativeKlibContentsTest>(
suiteTestClassName = "K1NativeKLibContentsTestGenerated", suiteTestClassName = "NativeKLibContentsTestGenerated",
annotations = listOf(k1libContents()) annotations = listOf(k1libContents())
) { ) {
model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true) model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true)