Minor. Merge multiplatformTypeRefinement testdata with multiplatform testdata

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -675,7 +675,6 @@ fun main(args: Array<String>) {
 
         testClass<AbstractMultiplatformAnalysisTest> {
             model("multiplatform", recursive = false, extension = null)
-            model("multiplatformTypeRefinement", recursive = false, extension = null)
         }
 
         testClass<AbstractQuickFixMultiModuleTest> {

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java

@@ -17,136 +17,120 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
+@TestMetadata("idea/testData/multiplatform")
+@TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAnalysisTest {
-    @TestMetadata("idea/testData/multiplatform")
+    private void runTest(String testDataFilePath) throws Exception {
-    @TestDataPath("$PROJECT_ROOT")
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Multiplatform extends AbstractMultiplatformAnalysisTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInMultiplatform() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiplatform"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
-        }
-
-        @TestMetadata("internalFromDependsOn")
-        public void testInternalFromDependsOn() throws Exception {
-            runTest("idea/testData/multiplatform/internalFromDependsOn/");
-        }
-
-        @TestMetadata("internalFromDependsOnOfProduction")
-        public void testInternalFromDependsOnOfProduction() throws Exception {
-            runTest("idea/testData/multiplatform/internalFromDependsOnOfProduction/");
-        }
-
-        @TestMetadata("internalFromProduction")
-        public void testInternalFromProduction() throws Exception {
-            runTest("idea/testData/multiplatform/internalFromProduction/");
-        }
-
-        @TestMetadata("useCorrectBuiltIns")
-        public void testUseCorrectBuiltIns() throws Exception {
-            runTest("idea/testData/multiplatform/useCorrectBuiltIns/");
-        }
     }
 
-    @TestMetadata("idea/testData/multiplatformTypeRefinement")
+    @TestMetadata("aliasesTypeMismatch")
-    @TestDataPath("$PROJECT_ROOT")
+    public void testAliasesTypeMismatch() throws Exception {
-    @RunWith(JUnit3RunnerWithInners.class)
+        runTest("idea/testData/multiplatform/aliasesTypeMismatch/");
-    public static class MultiplatformTypeRefinement extends AbstractMultiplatformAnalysisTest {
+    }
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-        }
 
-        @TestMetadata("aliasesTypeMismatch")
+    public void testAllFilesPresentInMultiplatform() throws Exception {
-        public void testAliasesTypeMismatch() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiplatform"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
-            runTest("idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/");
+    }
-        }
 
-        public void testAllFilesPresentInMultiplatformTypeRefinement() throws Exception {
+    @TestMetadata("callableReferences")
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiplatformTypeRefinement"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+    public void testCallableReferences() throws Exception {
-        }
+        runTest("idea/testData/multiplatform/callableReferences/");
+    }
 
-        @TestMetadata("callableReferences")
+    @TestMetadata("constructorsOfExpect")
-        public void testCallableReferences() throws Exception {
+    public void testConstructorsOfExpect() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/callableReferences/");
+        runTest("idea/testData/multiplatform/constructorsOfExpect/");
-        }
+    }
 
-        @TestMetadata("constructorsOfExpect")
+    @TestMetadata("diamondModuleDependency1")
-        public void testConstructorsOfExpect() throws Exception {
+    public void testDiamondModuleDependency1() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/constructorsOfExpect/");
+        runTest("idea/testData/multiplatform/diamondModuleDependency1/");
-        }
+    }
 
-        @TestMetadata("diamondModuleDependency1")
+    @TestMetadata("diamondModuleDependency2")
-        public void testDiamondModuleDependency1() throws Exception {
+    public void testDiamondModuleDependency2() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/");
+        runTest("idea/testData/multiplatform/diamondModuleDependency2/");
-        }
+    }
 
-        @TestMetadata("diamondModuleDependency2")
+    @TestMetadata("extensionOnExpect")
-        public void testDiamondModuleDependency2() throws Exception {
+    public void testExtensionOnExpect() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/");
+        runTest("idea/testData/multiplatform/extensionOnExpect/");
-        }
+    }
 
-        @TestMetadata("extensionOnExpect")
+    @TestMetadata("internalFromDependsOn")
-        public void testExtensionOnExpect() throws Exception {
+    public void testInternalFromDependsOn() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/extensionOnExpect/");
+        runTest("idea/testData/multiplatform/internalFromDependsOn/");
-        }
+    }
 
-        @TestMetadata("jsNameClash")
+    @TestMetadata("internalFromDependsOnOfProduction")
-        public void testJsNameClash() throws Exception {
+    public void testInternalFromDependsOnOfProduction() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/jsNameClash/");
+        runTest("idea/testData/multiplatform/internalFromDependsOnOfProduction/");
-        }
+    }
 
-        @TestMetadata("lambdas")
+    @TestMetadata("internalFromProduction")
-        public void testLambdas() throws Exception {
+    public void testInternalFromProduction() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/lambdas/");
+        runTest("idea/testData/multiplatform/internalFromProduction/");
-        }
+    }
 
-        @TestMetadata("languageConstructions")
+    @TestMetadata("jsNameClash")
-        public void testLanguageConstructions() throws Exception {
+    public void testJsNameClash() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/languageConstructions/");
+        runTest("idea/testData/multiplatform/jsNameClash/");
-        }
+    }
 
-        @TestMetadata("multilevelParents")
+    @TestMetadata("lambdas")
-        public void testMultilevelParents() throws Exception {
+    public void testLambdas() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/multilevelParents/");
+        runTest("idea/testData/multiplatform/lambdas/");
-        }
+    }
 
-        @TestMetadata("qualifiedReceiver")
+    @TestMetadata("languageConstructions")
-        public void testQualifiedReceiver() throws Exception {
+    public void testLanguageConstructions() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/qualifiedReceiver/");
+        runTest("idea/testData/multiplatform/languageConstructions/");
-        }
+    }
 
-        @TestMetadata("recursiveTypes")
+    @TestMetadata("multilevelParents")
-        public void testRecursiveTypes() throws Exception {
+    public void testMultilevelParents() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/recursiveTypes/");
+        runTest("idea/testData/multiplatform/multilevelParents/");
-        }
+    }
 
-        @TestMetadata("simple")
+    @TestMetadata("qualifiedReceiver")
-        public void testSimple() throws Exception {
+    public void testQualifiedReceiver() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/simple/");
+        runTest("idea/testData/multiplatform/qualifiedReceiver/");
-        }
+    }
 
-        @TestMetadata("supertypes")
+    @TestMetadata("recursiveTypes")
-        public void testSupertypes() throws Exception {
+    public void testRecursiveTypes() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/supertypes/");
+        runTest("idea/testData/multiplatform/recursiveTypes/");
-        }
+    }
 
-        @TestMetadata("typeAliasToExpectClassExplicitReference")
+    @TestMetadata("simple")
-        public void testTypeAliasToExpectClassExplicitReference() throws Exception {
+    public void testSimple() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/");
+        runTest("idea/testData/multiplatform/simple/");
-        }
+    }
 
-        @TestMetadata("typeAliases")
+    @TestMetadata("supertypes")
-        public void testTypeAliases() throws Exception {
+    public void testSupertypes() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/typeAliases/");
+        runTest("idea/testData/multiplatform/supertypes/");
-        }
+    }
 
-        @TestMetadata("typeParameters")
+    @TestMetadata("typeAliasToExpectClassExplicitReference")
-        public void testTypeParameters() throws Exception {
+    public void testTypeAliasToExpectClassExplicitReference() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/typeParameters/");
+        runTest("idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/");
-        }
+    }
+
+    @TestMetadata("typeAliases")
+    public void testTypeAliases() throws Exception {
+        runTest("idea/testData/multiplatform/typeAliases/");
+    }
+
+    @TestMetadata("typeParameters")
+    public void testTypeParameters() throws Exception {
+        runTest("idea/testData/multiplatform/typeParameters/");
+    }
+
+    @TestMetadata("useCorrectBuiltIns")
+    public void testUseCorrectBuiltIns() throws Exception {
+        runTest("idea/testData/multiplatform/useCorrectBuiltIns/");
     }
 }