Configuration: move scratch tests to separate module

idea/scripting-support/build.gradle.kts

@@ -0,0 +1,50 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    testRuntime(intellijDep())
+    testRuntime(intellijRuntimeAnnotations())
+
+    testCompile(project(":compiler:backend"))
+    testCompile(project(":idea:idea-jvm"))
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea"))
+    testCompile(commonDep("junit:junit"))
+
+    testRuntime(project(":allopen-ide-plugin")) { isTransitive = false }
+    testRuntime(project(":kotlin-allopen-compiler-plugin"))
+    testRuntime(project(":noarg-ide-plugin")) { isTransitive = false }
+    testRuntime(project(":kotlin-noarg-compiler-plugin"))
+    testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
+    testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
+    testRuntime(project(":kotlin-scripting-compiler"))
+    testRuntime(project(":kotlin-scripting-compiler-impl"))
+    testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
+    testRuntime(project(":kotlinx-serialization-compiler-plugin"))
+    testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
+
+    Platform[192].orHigher {
+        testCompileOnly(intellijPluginDep("java"))
+        testRuntime(intellijPluginDep("java"))
+    }
+
+    testRuntime(project(":kotlin-reflect"))
+
+    testCompileOnly(intellijDep())
+}
+
+sourceSets {
+    "main" { none() }
+    "test" { projectDefault() }
+}
+
+projectTest {
+    dependsOn(":dist")
+    workingDir = rootDir
+}
+
+testsJar()

idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt

@@ -276,7 +276,7 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() {
     }
 
     protected fun testScratchText(): String {
-        return File(testDataPath, "idea/testData/scratch/custom/test_scratch.kts").readText()
+        return File(testDataPath, "idea/scripting-support/testData/scratch/custom/test_scratch.kts").readText()
     }
 
     override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory()

idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTestGenerated.java

@@ -17,7 +17,7 @@ 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/scratch/lineMarker")
+@TestMetadata("idea/scripting-support/testData/scratch/lineMarker")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ScratchLineMarkersTestGenerated extends AbstractScratchLineMarkersTest {
@@ -26,71 +26,71 @@ public class ScratchLineMarkersTestGenerated extends AbstractScratchLineMarkersT
     }
 
     public void testAllFilesPresentInLineMarker() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch/lineMarker"), Pattern.compile("^(.+)\\.(kt|kts)$"), TargetBackend.ANY, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch/lineMarker"), Pattern.compile("^(.+)\\.(kt|kts)$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("binaryExpression.kts")
     public void testBinaryExpression() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/binaryExpression.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/binaryExpression.kts");
     }
 
     @TestMetadata("binaryExpression2.kts")
     public void testBinaryExpression2() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/binaryExpression2.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/binaryExpression2.kts");
     }
 
     @TestMetadata("constantExpression.kts")
     public void testConstantExpression() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/constantExpression.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/constantExpression.kts");
     }
 
     @TestMetadata("for.kts")
     public void testFor() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/for.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/for.kts");
     }
 
     @TestMetadata("function.kts")
     public void testFunction() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/function.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/function.kts");
     }
 
     @TestMetadata("lambda.kts")
     public void testLambda() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/lambda.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/lambda.kts");
     }
 
     @TestMetadata("lambda2.kts")
     public void testLambda2() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/lambda2.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/lambda2.kts");
     }
 
     @TestMetadata("object.kts")
     public void testObject() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/object.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/object.kts");
     }
 
     @TestMetadata("parentesized.kts")
     public void testParentesized() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/parentesized.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/parentesized.kts");
     }
 
     @TestMetadata("qualified.kts")
     public void testQualified() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/qualified.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/qualified.kts");
     }
 
     @TestMetadata("qualifiedMultiLine.kts")
     public void testQualifiedMultiLine() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/qualifiedMultiLine.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/qualifiedMultiLine.kts");
     }
 
     @TestMetadata("referenceExpression.kts")
     public void testReferenceExpression() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/referenceExpression.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/referenceExpression.kts");
     }
 
     @TestMetadata("val.kts")
     public void testVal() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/val.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/val.kts");
     }
 }

idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java

@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest {
-    @TestMetadata("idea/testData/scratch")
+    @TestMetadata("idea/scripting-support/testData/scratch")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchCompiling extends AbstractScratchRunActionTest {
@@ -28,86 +28,86 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchCompiling() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("for.kts")
         public void testFor() throws Exception {
-            runTest("idea/testData/scratch/for.kts");
+            runTest("idea/scripting-support/testData/scratch/for.kts");
         }
 
         @TestMetadata("generics.kts")
         public void testGenerics() throws Exception {
-            runTest("idea/testData/scratch/generics.kts");
+            runTest("idea/scripting-support/testData/scratch/generics.kts");
         }
 
         @TestMetadata("klass.kts")
         public void testKlass() throws Exception {
-            runTest("idea/testData/scratch/klass.kts");
+            runTest("idea/scripting-support/testData/scratch/klass.kts");
         }
 
         @TestMetadata("libraryDepWithKotlinTest.kts")
         public void testLibraryDepWithKotlinTest() throws Exception {
-            runTest("idea/testData/scratch/libraryDepWithKotlinTest.kts");
+            runTest("idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.kts");
         }
 
         @TestMetadata("simple.kts")
         public void testSimple() throws Exception {
-            runTest("idea/testData/scratch/simple.kts");
+            runTest("idea/scripting-support/testData/scratch/simple.kts");
         }
 
         @TestMetadata("simpleFun.kts")
         public void testSimpleFun() throws Exception {
-            runTest("idea/testData/scratch/simpleFun.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleFun.kts");
         }
 
         @TestMetadata("simpleNoRuntime.kts")
         public void testSimpleNoRuntime() throws Exception {
-            runTest("idea/testData/scratch/simpleNoRuntime.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleNoRuntime.kts");
         }
 
         @TestMetadata("spacesAtLineStart.kts")
         public void testSpacesAtLineStart() throws Exception {
-            runTest("idea/testData/scratch/spacesAtLineStart.kts");
+            runTest("idea/scripting-support/testData/scratch/spacesAtLineStart.kts");
         }
 
         @TestMetadata("stdlibFun.kts")
         public void testStdlibFun() throws Exception {
-            runTest("idea/testData/scratch/stdlibFun.kts");
+            runTest("idea/scripting-support/testData/scratch/stdlibFun.kts");
         }
 
         @TestMetadata("unresolved.kts")
         public void testUnresolved() throws Exception {
-            runTest("idea/testData/scratch/unresolved.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolved.kts");
         }
 
         @TestMetadata("unresolvedMultiline.kts")
         public void testUnresolvedMultiline() throws Exception {
-            runTest("idea/testData/scratch/unresolvedMultiline.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolvedMultiline.kts");
         }
 
         @TestMetadata("userOutput.kts")
         public void testUserOutput() throws Exception {
-            runTest("idea/testData/scratch/userOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/userOutput.kts");
         }
 
         @TestMetadata("var.kts")
         public void testVar() throws Exception {
-            runTest("idea/testData/scratch/var.kts");
+            runTest("idea/scripting-support/testData/scratch/var.kts");
         }
 
         @TestMetadata("veryLongOutput.kts")
         public void testVeryLongOutput() throws Exception {
-            runTest("idea/testData/scratch/veryLongOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/veryLongOutput.kts");
         }
 
         @TestMetadata("when.kts")
         public void testWhen() throws Exception {
-            runTest("idea/testData/scratch/when.kts");
+            runTest("idea/scripting-support/testData/scratch/when.kts");
         }
     }
 
-    @TestMetadata("idea/testData/scratch")
+    @TestMetadata("idea/scripting-support/testData/scratch")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchRepl extends AbstractScratchRunActionTest {
@@ -116,86 +116,86 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchRepl() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("for.kts")
         public void testFor() throws Exception {
-            runTest("idea/testData/scratch/for.kts");
+            runTest("idea/scripting-support/testData/scratch/for.kts");
         }
 
         @TestMetadata("generics.kts")
         public void testGenerics() throws Exception {
-            runTest("idea/testData/scratch/generics.kts");
+            runTest("idea/scripting-support/testData/scratch/generics.kts");
         }
 
         @TestMetadata("klass.kts")
         public void testKlass() throws Exception {
-            runTest("idea/testData/scratch/klass.kts");
+            runTest("idea/scripting-support/testData/scratch/klass.kts");
         }
 
         @TestMetadata("libraryDepWithKotlinTest.kts")
         public void testLibraryDepWithKotlinTest() throws Exception {
-            runTest("idea/testData/scratch/libraryDepWithKotlinTest.kts");
+            runTest("idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.kts");
         }
 
         @TestMetadata("simple.kts")
         public void testSimple() throws Exception {
-            runTest("idea/testData/scratch/simple.kts");
+            runTest("idea/scripting-support/testData/scratch/simple.kts");
         }
 
         @TestMetadata("simpleFun.kts")
         public void testSimpleFun() throws Exception {
-            runTest("idea/testData/scratch/simpleFun.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleFun.kts");
         }
 
         @TestMetadata("simpleNoRuntime.kts")
         public void testSimpleNoRuntime() throws Exception {
-            runTest("idea/testData/scratch/simpleNoRuntime.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleNoRuntime.kts");
         }
 
         @TestMetadata("spacesAtLineStart.kts")
         public void testSpacesAtLineStart() throws Exception {
-            runTest("idea/testData/scratch/spacesAtLineStart.kts");
+            runTest("idea/scripting-support/testData/scratch/spacesAtLineStart.kts");
         }
 
         @TestMetadata("stdlibFun.kts")
         public void testStdlibFun() throws Exception {
-            runTest("idea/testData/scratch/stdlibFun.kts");
+            runTest("idea/scripting-support/testData/scratch/stdlibFun.kts");
         }
 
         @TestMetadata("unresolved.kts")
         public void testUnresolved() throws Exception {
-            runTest("idea/testData/scratch/unresolved.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolved.kts");
         }
 
         @TestMetadata("unresolvedMultiline.kts")
         public void testUnresolvedMultiline() throws Exception {
-            runTest("idea/testData/scratch/unresolvedMultiline.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolvedMultiline.kts");
         }
 
         @TestMetadata("userOutput.kts")
         public void testUserOutput() throws Exception {
-            runTest("idea/testData/scratch/userOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/userOutput.kts");
         }
 
         @TestMetadata("var.kts")
         public void testVar() throws Exception {
-            runTest("idea/testData/scratch/var.kts");
+            runTest("idea/scripting-support/testData/scratch/var.kts");
         }
 
         @TestMetadata("veryLongOutput.kts")
         public void testVeryLongOutput() throws Exception {
-            runTest("idea/testData/scratch/veryLongOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/veryLongOutput.kts");
         }
 
         @TestMetadata("when.kts")
         public void testWhen() throws Exception {
-            runTest("idea/testData/scratch/when.kts");
+            runTest("idea/scripting-support/testData/scratch/when.kts");
         }
     }
 
-    @TestMetadata("idea/testData/scratch/multiFile")
+    @TestMetadata("idea/scripting-support/testData/scratch/multiFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchMultiFile extends AbstractScratchRunActionTest {
@@ -204,21 +204,21 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchMultiFile() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("inlineFun")
         public void testInlineFun() throws Exception {
-            runTest("idea/testData/scratch/multiFile/inlineFun/");
+            runTest("idea/scripting-support/testData/scratch/multiFile/inlineFun/");
         }
 
         @TestMetadata("javaDep")
         public void testJavaDep() throws Exception {
-            runTest("idea/testData/scratch/multiFile/javaDep/");
+            runTest("idea/scripting-support/testData/scratch/multiFile/javaDep/");
         }
     }
 
-    @TestMetadata("idea/testData/worksheet")
+    @TestMetadata("idea/scripting-support/testData/worksheet")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WorksheetCompiling extends AbstractScratchRunActionTest {
@@ -227,16 +227,16 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInWorksheetCompiling() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("simpleScriptRuntime.ws.kts")
         public void testSimpleScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/simpleScriptRuntime.ws.kts");
+            runTest("idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.kts");
         }
     }
 
-    @TestMetadata("idea/testData/worksheet")
+    @TestMetadata("idea/scripting-support/testData/worksheet")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WorksheetRepl extends AbstractScratchRunActionTest {
@@ -245,16 +245,16 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInWorksheetRepl() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("simpleScriptRuntime.ws.kts")
         public void testSimpleScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/simpleScriptRuntime.ws.kts");
+            runTest("idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.kts");
         }
     }
 
-    @TestMetadata("idea/testData/worksheet/multiFile")
+    @TestMetadata("idea/scripting-support/testData/worksheet/multiFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WorksheetMultiFile extends AbstractScratchRunActionTest {
@@ -263,21 +263,21 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInWorksheetMultiFile() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/worksheet/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/worksheet/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("inlineFunScriptRuntime")
         public void testInlineFunScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/multiFile/inlineFunScriptRuntime/");
+            runTest("idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/");
         }
 
         @TestMetadata("javaDepScriptRuntime")
         public void testJavaDepScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/multiFile/javaDepScriptRuntime/");
+            runTest("idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/");
         }
     }
 
-    @TestMetadata("idea/testData/scratch/rightPanelOutput")
+    @TestMetadata("idea/scripting-support/testData/scratch/rightPanelOutput")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchRightPanelOutput extends AbstractScratchRunActionTest {
@@ -286,22 +286,22 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchRightPanelOutput() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch/rightPanelOutput"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch/rightPanelOutput"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("bigSequentialOutputs.kts")
         public void testBigSequentialOutputs() throws Exception {
-            runTest("idea/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts");
+            runTest("idea/scripting-support/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts");
         }
 
         @TestMetadata("shortExpression.longOutput.singleTop.kts")
         public void testShortExpression_longOutput_singleTop() throws Exception {
-            runTest("idea/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts");
+            runTest("idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts");
         }
 
         @TestMetadata("shortExpression.shortOutput.singleTop.kts")
         public void testShortExpression_shortOutput_singleTop() throws Exception {
-            runTest("idea/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts");
+            runTest("idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts");
         }
     }
 }