[K/N][tests] Move tests into better places

^KT-61259

native/native.tests/testData/codegen/literals/strdedup2.kt

@@ -4,7 +4,8 @@
  */
 // TODO: string deduplication across several components seems to require
 // linking them as bitcode modules before translating to machine code.
-// IGNORE_BACKEND: NATIVE, JVM, JVM_IR
+// IGNORE_BACKEND: JVM, JVM_IR
+// DISABLE_NATIVE
 // WITH_STDLIB
 
 import kotlin.test.*

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java

@@ -20,14 +20,12 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
+@TestMetadata("native/native.tests/testData/codegen")
+@TestDataPath("$PROJECT_ROOT")
+@Tag("frontend-fir")
+@FirPipeline()
+@UseExtTestCaseGroupProvider()
 public class FirNativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTest {
-    @Nested
-    @TestMetadata("native/native.tests/testData/codegen")
-    @TestDataPath("$PROJECT_ROOT")
-    @Tag("frontend-fir")
-    @FirPipeline()
-    @UseExtTestCaseGroupProvider()
-    public class Codegen {
     @Test
     public void testAllFilesPresentInCodegen() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
@@ -3242,6 +3240,37 @@ public class FirNativeCodegenLocalTestGenerated extends AbstractNativeCodegenBox
         }
     }
 
+    @Nested
+    @TestMetadata("native/native.tests/testData/codegen/literals")
+    @TestDataPath("$PROJECT_ROOT")
+    @Tag("frontend-fir")
+    @FirPipeline()
+    @UseExtTestCaseGroupProvider()
+    public class Literals {
+        @Test
+        public void testAllFilesPresentInLiterals() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/literals"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        }
+
+        @Test
+        @TestMetadata("listof1.kt")
+        public void testListof1() throws Exception {
+            runTest("native/native.tests/testData/codegen/literals/listof1.kt");
+        }
+
+        @Test
+        @TestMetadata("strdedup1.kt")
+        public void testStrdedup1() throws Exception {
+            runTest("native/native.tests/testData/codegen/literals/strdedup1.kt");
+        }
+
+        @Test
+        @TestMetadata("strdedup2.kt")
+        public void testStrdedup2() throws Exception {
+            runTest("native/native.tests/testData/codegen/literals/strdedup2.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("native/native.tests/testData/codegen/localClass")
     @TestDataPath("$PROJECT_ROOT")
@@ -3598,6 +3627,25 @@ public class FirNativeCodegenLocalTestGenerated extends AbstractNativeCodegenBox
         }
     }
 
+    @Nested
+    @TestMetadata("native/native.tests/testData/codegen/reflection")
+    @TestDataPath("$PROJECT_ROOT")
+    @Tag("frontend-fir")
+    @FirPipeline()
+    @UseExtTestCaseGroupProvider()
+    public class Reflection {
+        @Test
+        public void testAllFilesPresentInReflection() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/reflection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        }
+
+        @Test
+        @TestMetadata("collectReferenceFieldValues.kt")
+        public void testCollectReferenceFieldValues() throws Exception {
+            runTest("native/native.tests/testData/codegen/reflection/collectReferenceFieldValues.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("native/native.tests/testData/codegen/serialization")
     @TestDataPath("$PROJECT_ROOT")
@@ -3829,81 +3877,4 @@ public class FirNativeCodegenLocalTestGenerated extends AbstractNativeCodegenBox
             runTest("native/native.tests/testData/codegen/vector/default_argument.kt");
         }
     }
-    }
-
-    @Nested
-    @TestMetadata("native/native.tests/testData/datagen")
-    @TestDataPath("$PROJECT_ROOT")
-    @Tag("frontend-fir")
-    @FirPipeline()
-    @UseExtTestCaseGroupProvider()
-    public class Datagen {
-        @Test
-        public void testAllFilesPresentInDatagen() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/datagen"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-        }
-
-        @Nested
-        @TestMetadata("native/native.tests/testData/datagen/literals")
-        @TestDataPath("$PROJECT_ROOT")
-        @Tag("frontend-fir")
-        @FirPipeline()
-        @UseExtTestCaseGroupProvider()
-        public class Literals {
-            @Test
-            public void testAllFilesPresentInLiterals() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/datagen/literals"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-            }
-
-            @Test
-            @TestMetadata("listof1.kt")
-            public void testListof1() throws Exception {
-                runTest("native/native.tests/testData/datagen/literals/listof1.kt");
-            }
-
-            @Test
-            @TestMetadata("strdedup1.kt")
-            public void testStrdedup1() throws Exception {
-                runTest("native/native.tests/testData/datagen/literals/strdedup1.kt");
-            }
-
-            @Test
-            @TestMetadata("strdedup2.kt")
-            public void testStrdedup2() throws Exception {
-                runTest("native/native.tests/testData/datagen/literals/strdedup2.kt");
-            }
-        }
-    }
-
-    @Nested
-    @TestMetadata("native/native.tests/testData/runtime")
-    @TestDataPath("$PROJECT_ROOT")
-    @Tag("frontend-fir")
-    @FirPipeline()
-    @UseExtTestCaseGroupProvider()
-    public class Runtime {
-        @Test
-        public void testAllFilesPresentInRuntime() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/runtime"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-        }
-
-        @Nested
-        @TestMetadata("native/native.tests/testData/runtime/basic")
-        @TestDataPath("$PROJECT_ROOT")
-        @Tag("frontend-fir")
-        @FirPipeline()
-        @UseExtTestCaseGroupProvider()
-        public class Basic {
-            @Test
-            public void testAllFilesPresentInBasic() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/runtime/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-            }
-
-            @Test
-            @TestMetadata("collectReferenceFieldValues.kt")
-            public void testCollectReferenceFieldValues() throws Exception {
-                runTest("native/native.tests/testData/runtime/basic/collectReferenceFieldValues.kt");
-            }
-        }
-    }
 }

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java

@@ -18,12 +18,10 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
+@TestMetadata("native/native.tests/testData/codegen")
+@TestDataPath("$PROJECT_ROOT")
+@UseExtTestCaseGroupProvider()
 public class NativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTest {
-    @Nested
-    @TestMetadata("native/native.tests/testData/codegen")
-    @TestDataPath("$PROJECT_ROOT")
-    @UseExtTestCaseGroupProvider()
-    public class Codegen {
     @Test
     public void testAllFilesPresentInCodegen() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
@@ -3168,6 +3166,35 @@ public class NativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTes
         }
     }
 
+    @Nested
+    @TestMetadata("native/native.tests/testData/codegen/literals")
+    @TestDataPath("$PROJECT_ROOT")
+    @UseExtTestCaseGroupProvider()
+    public class Literals {
+        @Test
+        public void testAllFilesPresentInLiterals() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/literals"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        }
+
+        @Test
+        @TestMetadata("listof1.kt")
+        public void testListof1() throws Exception {
+            runTest("native/native.tests/testData/codegen/literals/listof1.kt");
+        }
+
+        @Test
+        @TestMetadata("strdedup1.kt")
+        public void testStrdedup1() throws Exception {
+            runTest("native/native.tests/testData/codegen/literals/strdedup1.kt");
+        }
+
+        @Test
+        @TestMetadata("strdedup2.kt")
+        public void testStrdedup2() throws Exception {
+            runTest("native/native.tests/testData/codegen/literals/strdedup2.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("native/native.tests/testData/codegen/localClass")
     @TestDataPath("$PROJECT_ROOT")
@@ -3508,6 +3535,23 @@ public class NativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTes
         }
     }
 
+    @Nested
+    @TestMetadata("native/native.tests/testData/codegen/reflection")
+    @TestDataPath("$PROJECT_ROOT")
+    @UseExtTestCaseGroupProvider()
+    public class Reflection {
+        @Test
+        public void testAllFilesPresentInReflection() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/reflection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        }
+
+        @Test
+        @TestMetadata("collectReferenceFieldValues.kt")
+        public void testCollectReferenceFieldValues() throws Exception {
+            runTest("native/native.tests/testData/codegen/reflection/collectReferenceFieldValues.kt");
+        }
+    }
+
     @Nested
     @TestMetadata("native/native.tests/testData/codegen/serialization")
     @TestDataPath("$PROJECT_ROOT")
@@ -3731,73 +3775,4 @@ public class NativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTes
             runTest("native/native.tests/testData/codegen/vector/default_argument.kt");
         }
     }
-    }
-
-    @Nested
-    @TestMetadata("native/native.tests/testData/datagen")
-    @TestDataPath("$PROJECT_ROOT")
-    @UseExtTestCaseGroupProvider()
-    public class Datagen {
-        @Test
-        public void testAllFilesPresentInDatagen() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/datagen"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-        }
-
-        @Nested
-        @TestMetadata("native/native.tests/testData/datagen/literals")
-        @TestDataPath("$PROJECT_ROOT")
-        @UseExtTestCaseGroupProvider()
-        public class Literals {
-            @Test
-            public void testAllFilesPresentInLiterals() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/datagen/literals"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-            }
-
-            @Test
-            @TestMetadata("listof1.kt")
-            public void testListof1() throws Exception {
-                runTest("native/native.tests/testData/datagen/literals/listof1.kt");
-            }
-
-            @Test
-            @TestMetadata("strdedup1.kt")
-            public void testStrdedup1() throws Exception {
-                runTest("native/native.tests/testData/datagen/literals/strdedup1.kt");
-            }
-
-            @Test
-            @TestMetadata("strdedup2.kt")
-            public void testStrdedup2() throws Exception {
-                runTest("native/native.tests/testData/datagen/literals/strdedup2.kt");
-            }
-        }
-    }
-
-    @Nested
-    @TestMetadata("native/native.tests/testData/runtime")
-    @TestDataPath("$PROJECT_ROOT")
-    @UseExtTestCaseGroupProvider()
-    public class Runtime {
-        @Test
-        public void testAllFilesPresentInRuntime() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/runtime"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-        }
-
-        @Nested
-        @TestMetadata("native/native.tests/testData/runtime/basic")
-        @TestDataPath("$PROJECT_ROOT")
-        @UseExtTestCaseGroupProvider()
-        public class Basic {
-            @Test
-            public void testAllFilesPresentInBasic() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/runtime/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-            }
-
-            @Test
-            @TestMetadata("collectReferenceFieldValues.kt")
-            public void testCollectReferenceFieldValues() throws Exception {
-                runTest("native/native.tests/testData/runtime/basic/collectReferenceFieldValues.kt");
-            }
-        }
-    }
 }

native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt

@@ -38,8 +38,6 @@ fun main() {
                 )
             ) {
                 model("codegen", targetBackend = TargetBackend.NATIVE)
-                model("datagen", targetBackend = TargetBackend.NATIVE)
-                model("runtime", targetBackend = TargetBackend.NATIVE)
             }
             testClass<AbstractNativeCodegenBoxTest>(
                 suiteTestClassName = "FirNativeCodegenLocalTestGenerated",
@@ -49,8 +47,6 @@ fun main() {
                 )
             ) {
                 model("codegen", targetBackend = TargetBackend.NATIVE)
-                model("datagen", targetBackend = TargetBackend.NATIVE)
-                model("runtime", targetBackend = TargetBackend.NATIVE)
             }
         }