[TEST] Move generated fir tests to test-gen directories

JetBrains · Nov 27, 2020 · eca769f · eca769f
1 parent 1ee3828
commit eca769f
Show file tree

Hide file tree

Showing 29 changed files with 74 additions and 18 deletions.
diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.ideaExt.idea
+
 /*
  * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
@@ -29,9 +31,21 @@ dependencies {
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
+val generationRoot = projectDir.resolve("tests-gen")
+
 sourceSets {
     "main" { none() }
-    "test" { projectDefault() }
+    "test" {
+        projectDefault()
+        this.java.srcDir(generationRoot.name)
+    }
+}
+
+if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
+    apply(plugin = "idea")
+    idea {
+        this.module.generatedSourceDirs.add(generationRoot)
+    }
 }
 
 projectTest(parallel = true) {

diff --git a/.../ExtendedFirDiagnosticsTestGenerated.java → .../ExtendedFirDiagnosticsTestGenerated.java b/.../ExtendedFirDiagnosticsTestGenerated.java → .../ExtendedFirDiagnosticsTestGenerated.java
diff --git a/...ithLightTreeDiagnosticsTestGenerated.java → ...ithLightTreeDiagnosticsTestGenerated.java b/...ithLightTreeDiagnosticsTestGenerated.java → ...ithLightTreeDiagnosticsTestGenerated.java
diff --git a/...tlin/fir/FirDiagnosticsTestGenerated.java → ...tlin/fir/FirDiagnosticsTestGenerated.java b/...tlin/fir/FirDiagnosticsTestGenerated.java → ...tlin/fir/FirDiagnosticsTestGenerated.java
diff --git a/...iagnosticsWithLightTreeTestGenerated.java → ...iagnosticsWithLightTreeTestGenerated.java b/...iagnosticsWithLightTreeTestGenerated.java → ...iagnosticsWithLightTreeTestGenerated.java
diff --git a/...irDiagnosticsWithStdlibTestGenerated.java → ...irDiagnosticsWithStdlibTestGenerated.java b/...irDiagnosticsWithStdlibTestGenerated.java → ...irDiagnosticsWithStdlibTestGenerated.java
diff --git a/...n/fir/FirLoadCompiledKotlinGenerated.java → ...n/fir/FirLoadCompiledKotlinGenerated.java b/...n/fir/FirLoadCompiledKotlinGenerated.java → ...n/fir/FirLoadCompiledKotlinGenerated.java
diff --git a/...rOldFrontendDiagnosticsTestGenerated.java → ...rOldFrontendDiagnosticsTestGenerated.java b/...rOldFrontendDiagnosticsTestGenerated.java → ...rOldFrontendDiagnosticsTestGenerated.java
diff --git a/...ndDiagnosticsTestWithStdlibGenerated.java → ...ndDiagnosticsTestWithStdlibGenerated.java b/...ndDiagnosticsTestWithStdlibGenerated.java → ...ndDiagnosticsTestWithStdlibGenerated.java
diff --git a/...ouchedTilContractsPhaseTestGenerated.java → ...ouchedTilContractsPhaseTestGenerated.java b/...ouchedTilContractsPhaseTestGenerated.java → ...ouchedTilContractsPhaseTestGenerated.java
diff --git a/...OldFrontendLightClassesTestGenerated.java → ...OldFrontendLightClassesTestGenerated.java b/...OldFrontendLightClassesTestGenerated.java → ...OldFrontendLightClassesTestGenerated.java
diff --git a/...java/FirTypeEnhancementTestGenerated.java → ...java/FirTypeEnhancementTestGenerated.java b/...java/FirTypeEnhancementTestGenerated.java → ...java/FirTypeEnhancementTestGenerated.java
diff --git a/...a/OwnFirTypeEnhancementTestGenerated.java → ...a/OwnFirTypeEnhancementTestGenerated.java b/...a/OwnFirTypeEnhancementTestGenerated.java → ...a/OwnFirTypeEnhancementTestGenerated.java
diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.ideaExt.idea
+
 plugins {
     kotlin("jvm")
     id("jps-compatible")
@@ -34,9 +36,21 @@ dependencies {
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
+val generationRoot = projectDir.resolve("tests-gen")
+
 sourceSets {
     "main" { projectDefault() }
-    "test" { projectDefault() }
+    "test" {
+        projectDefault()
+        this.java.srcDir(generationRoot.name)
+    }
+}
+
+if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
+    apply(plugin = "idea")
+    idea {
+        this.module.generatedSourceDirs.add(generationRoot)
+    }
 }
 
 projectTest(parallel = true) {

diff --git a/...pileKotlinAgainstKotlinTestGenerated.java → ...pileKotlinAgainstKotlinTestGenerated.java b/...pileKotlinAgainstKotlinTestGenerated.java → ...pileKotlinAgainstKotlinTestGenerated.java
diff --git a/...ckBoxAgainstJavaCodegenTestGenerated.java → ...ckBoxAgainstJavaCodegenTestGenerated.java b/...ckBoxAgainstJavaCodegenTestGenerated.java → ...ckBoxAgainstJavaCodegenTestGenerated.java
diff --git a/...n/ir/FirBlackBoxCodegenTestGenerated.java → ...n/ir/FirBlackBoxCodegenTestGenerated.java b/...n/ir/FirBlackBoxCodegenTestGenerated.java → ...n/ir/FirBlackBoxCodegenTestGenerated.java
diff --git a/...irBlackBoxInlineCodegenTestGenerated.java → ...irBlackBoxInlineCodegenTestGenerated.java b/...irBlackBoxInlineCodegenTestGenerated.java → ...irBlackBoxInlineCodegenTestGenerated.java
diff --git a/...egen/ir/FirBytecodeTextTestGenerated.java → ...egen/ir/FirBytecodeTextTestGenerated.java b/...egen/ir/FirBytecodeTextTestGenerated.java → ...egen/ir/FirBytecodeTextTestGenerated.java
diff --git a/...s/kotlin/fir/Fir2IrTextTestGenerated.java → ...s/kotlin/fir/Fir2IrTextTestGenerated.java b/...s/kotlin/fir/Fir2IrTextTestGenerated.java → ...s/kotlin/fir/Fir2IrTextTestGenerated.java
diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.ideaExt.idea
+
 plugins {
     kotlin("jvm")
     id("jps-compatible")
@@ -41,9 +43,21 @@ dependencies {
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
+val generationRoot = projectDir.resolve("tests-gen")
+
 sourceSets {
     "main" { projectDefault() }
-    "test" { projectDefault() }
+    "test" {
+        projectDefault()
+        this.java.srcDir(generationRoot.name)
+    }
+}
+
+if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
+    apply(plugin = "idea")
+    idea {
+        this.module.generatedSourceDirs.add(generationRoot)
+    }
 }
 
 projectTest {

diff --git a/...htTree2FirConverterTestCaseGenerated.java → ...htTree2FirConverterTestCaseGenerated.java b/...htTree2FirConverterTestCaseGenerated.java → ...htTree2FirConverterTestCaseGenerated.java
diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.ideaExt.idea
+
 /*
  * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
@@ -31,9 +33,21 @@ dependencies {
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
+val generationRoot = projectDir.resolve("tests-gen")
+
 sourceSets {
     "main" { projectDefault() }
-    "test" { projectDefault() }
+    "test" {
+        projectDefault()
+        this.java.srcDir(generationRoot.name)
+    }
+}
+
+if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
+    apply(plugin = "idea")
+    idea {
+        this.module.generatedSourceDirs.add(generationRoot)
+    }
 }
 
 projectTest(parallel = true) {

diff --git a/...artialRawFirBuilderTestCaseGenerated.java → ...artialRawFirBuilderTestCaseGenerated.java b/...artialRawFirBuilderTestCaseGenerated.java → ...artialRawFirBuilderTestCaseGenerated.java
diff --git a/...irBuilderLazyBodiesTestCaseGenerated.java → ...irBuilderLazyBodiesTestCaseGenerated.java b/...irBuilderLazyBodiesTestCaseGenerated.java → ...irBuilderLazyBodiesTestCaseGenerated.java
diff --git a/...ourceElementMappingTestCaseGenerated.java → ...ourceElementMappingTestCaseGenerated.java b/...ourceElementMappingTestCaseGenerated.java → ...ourceElementMappingTestCaseGenerated.java
diff --git a/...ilder/RawFirBuilderTestCaseGenerated.java → ...ilder/RawFirBuilderTestCaseGenerated.java b/...ilder/RawFirBuilderTestCaseGenerated.java → ...ilder/RawFirBuilderTestCaseGenerated.java
diff --git a/...g/jetbrains/kotlin/fir/builder/RawFirBuilderSourceElementUniquenessTestCaseGenerated.java b/...g/jetbrains/kotlin/fir/builder/RawFirBuilderSourceElementUniquenessTestCaseGenerated.java
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -564,7 +564,7 @@ fun main(args: Array<String>) {
         }
 
         testGroup(
-            "compiler/fir/fir2ir/tests", "compiler/testData",
+            "compiler/fir/fir2ir/tests-gen", "compiler/testData",
             testRunnerMethodName = "runTestWithCustomIgnoreDirective",
             additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_FIR: \"")
         ) {
@@ -612,7 +612,7 @@ fun main(args: Array<String>) {
             }
         }
 
-        testGroup("compiler/fir/raw-fir/psi2fir/tests", "compiler/fir/raw-fir/psi2fir/testData") {
+        testGroup("compiler/fir/raw-fir/psi2fir/tests-gen", "compiler/fir/raw-fir/psi2fir/testData") {
             testClass<AbstractRawFirBuilderTestCase> {
                 model("rawBuilder", testMethod = "doRawFirTest")
             }
@@ -626,19 +626,19 @@ fun main(args: Array<String>) {
             }
         }
 
-        testGroup("compiler/fir/raw-fir/psi2fir/tests", "compiler/fir/raw-fir/psi2fir/testData") {
+        testGroup("compiler/fir/raw-fir/psi2fir/tests-gen", "compiler/fir/raw-fir/psi2fir/testData") {
             testClass<AbstractPartialRawFirBuilderTestCase> {
                 model("partialRawBuilder", testMethod = "doRawFirTest")
             }
         }
 
-        testGroup("compiler/fir/raw-fir/light-tree2fir/tests", "compiler/fir/raw-fir/psi2fir/testData") {
+        testGroup("compiler/fir/raw-fir/light-tree2fir/tests-gen", "compiler/fir/raw-fir/psi2fir/testData") {
             testClass<AbstractLightTree2FirConverterTestCase> {
                 model("rawBuilder")
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractFirDiagnosticsTest> {
                 model("resolve", pattern = KT_WITHOUT_DOTS_IN_NAME)
             }
@@ -653,31 +653,31 @@ fun main(args: Array<String>) {
 
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractFirDiagnosticsWithStdlibTest> {
                 model("resolveWithStdlib", pattern = KT_WITHOUT_DOTS_IN_NAME)
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
             testClass<AbstractFirLoadCompiledKotlin> {
                 model("loadJava/compiledKotlin", extension = "kt")
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
             testClass<AbstractFirTypeEnhancementTest> {
                 model("loadJava/compiledJava", extension = "java")
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractOwnFirTypeEnhancementTest> {
                 model("enhancement", extension = "java")
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
             testClass<AbstractFirOldFrontendDiagnosticsTest> {
                 model("diagnostics/tests", excludedPattern = excludedFirTestdataPattern)
             }
@@ -691,14 +691,14 @@ fun main(args: Array<String>) {
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractFirOldFrontendLightClassesTest> {
                 model("lightClasses")
             }
         }
 
         testGroup(
-            "compiler/fir/fir2ir/tests", "compiler/testData",
+            "compiler/fir/fir2ir/tests-gen", "compiler/testData",
             testRunnerMethodName = "runTestWithCustomIgnoreDirective",
             additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_FIR: \"")
         ) {
@@ -727,13 +727,13 @@ fun main(args: Array<String>) {
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractExtendedFirDiagnosticsTest> {
                 model("extendedCheckers", pattern = KT_WITHOUT_DOTS_IN_NAME)
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractExtendedFirWithLightTreeDiagnosticsTest> {
                 model("extendedCheckers", pattern = KT_WITHOUT_DOTS_IN_NAME)
             }