From 8919703448dbf61a1cf19b2b26df9bcbaab5a8a5 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 30 Jun 2022 11:50:45 +0300
Subject: [PATCH] [Test] Extract CLI tests for plugins into separate directory

---
 .../jvm/{ => plugins}/firAllOpenPlugin.args   |  0
 .../cli/jvm/{ => plugins}/firAllOpenPlugin.kt |  0
 .../jvm/{ => plugins}/firAllOpenPlugin.out    |  0
 .../cli/jvm/{ => plugins}/pluginSimple.args   |  4 +-
 .../cli/jvm/{ => plugins}/pluginSimple.kt     |  0
 .../cli/jvm/{ => plugins}/pluginSimple.out    |  0
 .../jvm/{ => plugins}/pluginWithK2Error.args  |  4 +-
 .../jvm/{ => plugins}/pluginWithK2Error.kt    |  0
 .../jvm/{ => plugins}/pluginWithK2Error.out   |  0
 .../generators/GenerateJUnit3CompilerTests.kt |  1 +
 .../kotlin/cli/CliTestGenerated.java          | 43 ++++++++++++-------
 11 files changed, 33 insertions(+), 19 deletions(-)
 rename compiler/testData/cli/jvm/{ => plugins}/firAllOpenPlugin.args (100%)
 rename compiler/testData/cli/jvm/{ => plugins}/firAllOpenPlugin.kt (100%)
 rename compiler/testData/cli/jvm/{ => plugins}/firAllOpenPlugin.out (100%)
 rename compiler/testData/cli/jvm/{ => plugins}/pluginSimple.args (80%)
 rename compiler/testData/cli/jvm/{ => plugins}/pluginSimple.kt (100%)
 rename compiler/testData/cli/jvm/{ => plugins}/pluginSimple.out (100%)
 rename compiler/testData/cli/jvm/{ => plugins}/pluginWithK2Error.args (81%)
 rename compiler/testData/cli/jvm/{ => plugins}/pluginWithK2Error.kt (100%)
 rename compiler/testData/cli/jvm/{ => plugins}/pluginWithK2Error.out (100%)

diff --git a/compiler/testData/cli/jvm/firAllOpenPlugin.args b/compiler/testData/cli/jvm/plugins/firAllOpenPlugin.args
similarity index 100%
rename from compiler/testData/cli/jvm/firAllOpenPlugin.args
rename to compiler/testData/cli/jvm/plugins/firAllOpenPlugin.args
diff --git a/compiler/testData/cli/jvm/firAllOpenPlugin.kt b/compiler/testData/cli/jvm/plugins/firAllOpenPlugin.kt
similarity index 100%
rename from compiler/testData/cli/jvm/firAllOpenPlugin.kt
rename to compiler/testData/cli/jvm/plugins/firAllOpenPlugin.kt
diff --git a/compiler/testData/cli/jvm/firAllOpenPlugin.out b/compiler/testData/cli/jvm/plugins/firAllOpenPlugin.out
similarity index 100%
rename from compiler/testData/cli/jvm/firAllOpenPlugin.out
rename to compiler/testData/cli/jvm/plugins/firAllOpenPlugin.out
diff --git a/compiler/testData/cli/jvm/pluginSimple.args b/compiler/testData/cli/jvm/plugins/pluginSimple.args
similarity index 80%
rename from compiler/testData/cli/jvm/pluginSimple.args
rename to compiler/testData/cli/jvm/plugins/pluginSimple.args
index 1c9d4c389b2..1a6caac8c39 100644
--- a/compiler/testData/cli/jvm/pluginSimple.args
+++ b/compiler/testData/cli/jvm/plugins/pluginSimple.args
@@ -4,6 +4,6 @@ $TEMP_DIR$
 -P
 plugin\:org.jetbrains.kotlin.android\:package=com.myapp
 -P
-plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/androidPlugin/res
+plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/../androidPlugin/res
 $TESTDATA_DIR$/pluginSimple.kt
-$TESTDATA_DIR$/androidPlugin
+$TESTDATA_DIR$/../androidPlugin
diff --git a/compiler/testData/cli/jvm/pluginSimple.kt b/compiler/testData/cli/jvm/plugins/pluginSimple.kt
similarity index 100%
rename from compiler/testData/cli/jvm/pluginSimple.kt
rename to compiler/testData/cli/jvm/plugins/pluginSimple.kt
diff --git a/compiler/testData/cli/jvm/pluginSimple.out b/compiler/testData/cli/jvm/plugins/pluginSimple.out
similarity index 100%
rename from compiler/testData/cli/jvm/pluginSimple.out
rename to compiler/testData/cli/jvm/plugins/pluginSimple.out
diff --git a/compiler/testData/cli/jvm/pluginWithK2Error.args b/compiler/testData/cli/jvm/plugins/pluginWithK2Error.args
similarity index 81%
rename from compiler/testData/cli/jvm/pluginWithK2Error.args
rename to compiler/testData/cli/jvm/plugins/pluginWithK2Error.args
index f2ff81689dd..269d3f68883 100644
--- a/compiler/testData/cli/jvm/pluginWithK2Error.args
+++ b/compiler/testData/cli/jvm/plugins/pluginWithK2Error.args
@@ -4,7 +4,7 @@ $TEMP_DIR$
 -P
 plugin\:org.jetbrains.kotlin.android\:package=com.myapp
 -P
-plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/androidPlugin/res
+plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/../androidPlugin/res
 $TESTDATA_DIR$/pluginSimple.kt
-$TESTDATA_DIR$/androidPlugin
+$TESTDATA_DIR$/../androidPlugin
 -Xuse-k2
diff --git a/compiler/testData/cli/jvm/pluginWithK2Error.kt b/compiler/testData/cli/jvm/plugins/pluginWithK2Error.kt
similarity index 100%
rename from compiler/testData/cli/jvm/pluginWithK2Error.kt
rename to compiler/testData/cli/jvm/plugins/pluginWithK2Error.kt
diff --git a/compiler/testData/cli/jvm/pluginWithK2Error.out b/compiler/testData/cli/jvm/plugins/pluginWithK2Error.out
similarity index 100%
rename from compiler/testData/cli/jvm/pluginWithK2Error.out
rename to compiler/testData/cli/jvm/plugins/pluginWithK2Error.out
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
index c75b7e3b470..5fe442597dc 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
@@ -251,6 +251,7 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
 
             testClass<AbstractCliTest> {
                 model("cli/jvm/readingConfigFromEnvironment", extension = "args", testMethod = "doJvmTest", recursive = false)
+                model("cli/jvm/plugins", extension = "args", testMethod = "doJvmTest", recursive = false)
                 model("cli/jvm", extension = "args", testMethod = "doJvmTest", recursive = false)
                 model("cli/js", extension = "args", testMethod = "doJsTest", recursive = false)
                 model("cli/js-dce", extension = "args", testMethod = "doJsDceTest", recursive = false)
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
index 2e093b1fc49..1727ded96db 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
@@ -57,6 +57,34 @@ public class CliTestGenerated extends AbstractCliTest {
         }
     }
 
+    @TestMetadata("compiler/testData/cli/jvm/plugins")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Plugins extends AbstractCliTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doJvmTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInPlugins() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/cli/jvm/plugins"), Pattern.compile("^(.+)\\.args$"), null, false);
+        }
+
+        @TestMetadata("firAllOpenPlugin.args")
+        public void testFirAllOpenPlugin() throws Exception {
+            runTest("compiler/testData/cli/jvm/plugins/firAllOpenPlugin.args");
+        }
+
+        @TestMetadata("pluginSimple.args")
+        public void testPluginSimple() throws Exception {
+            runTest("compiler/testData/cli/jvm/plugins/pluginSimple.args");
+        }
+
+        @TestMetadata("pluginWithK2Error.args")
+        public void testPluginWithK2Error() throws Exception {
+            runTest("compiler/testData/cli/jvm/plugins/pluginWithK2Error.args");
+        }
+    }
+
     @TestMetadata("compiler/testData/cli/jvm")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -369,11 +397,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/jvm/fileClassClashMultipleFiles.args");
         }
 
-        @TestMetadata("firAllOpenPlugin.args")
-        public void testFirAllOpenPlugin() throws Exception {
-            runTest("compiler/testData/cli/jvm/firAllOpenPlugin.args");
-        }
-
         @TestMetadata("firDeprecationJava.args")
         public void testFirDeprecationJava() throws Exception {
             runTest("compiler/testData/cli/jvm/firDeprecationJava.args");
@@ -874,16 +897,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/jvm/optInOverrideMessageFir.args");
         }
 
-        @TestMetadata("pluginSimple.args")
-        public void testPluginSimple() throws Exception {
-            runTest("compiler/testData/cli/jvm/pluginSimple.args");
-        }
-
-        @TestMetadata("pluginWithK2Error.args")
-        public void testPluginWithK2Error() throws Exception {
-            runTest("compiler/testData/cli/jvm/pluginWithK2Error.args");
-        }
-
         @TestMetadata("progressiveModeOff.args")
         public void testProgressiveModeOff() throws Exception {
             runTest("compiler/testData/cli/jvm/progressiveModeOff.args");