From 908732b3c1e181487e520cf2ac82c8b30129c745 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 27 Nov 2020 12:48:43 +0300 Subject: [PATCH] [TEST] Move generated visualizer tests to `test-gen` directories --- .../generators/tests/GenerateCompilerTests.kt | 4 ++-- compiler/visualizer/build.gradle.kts | 20 ++++++++++++++++--- .../FirVisualizerForRawFirDataGenerated.java | 0 ...irVisualizerForUncommonCasesGenerated.java | 0 .../PsiVisualizerForRawFirDataGenerated.java | 0 ...siVisualizerForUncommonCasesGenerated.java | 0 6 files changed, 19 insertions(+), 5 deletions(-) rename compiler/visualizer/{tests => tests-gen}/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForRawFirDataGenerated.java (100%) rename compiler/visualizer/{tests => tests-gen}/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForUncommonCasesGenerated.java (100%) rename compiler/visualizer/{tests => tests-gen}/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForRawFirDataGenerated.java (100%) rename compiler/visualizer/{tests => tests-gen}/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForUncommonCasesGenerated.java (100%) diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index d1c7d71d462..1001e93c592 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -707,7 +707,7 @@ fun main(args: Array) { } } - testGroup("compiler/visualizer/tests", "compiler/fir/raw-fir/psi2fir/testData") { + testGroup("compiler/visualizer/tests-gen", "compiler/fir/raw-fir/psi2fir/testData") { testClass("PsiVisualizerForRawFirDataGenerated") { model("rawBuilder", testMethod = "doFirBuilderDataTest") } @@ -717,7 +717,7 @@ fun main(args: Array) { } } - testGroup("compiler/visualizer/tests", "compiler/visualizer/testData") { + testGroup("compiler/visualizer/tests-gen", "compiler/visualizer/testData") { testClass("PsiVisualizerForUncommonCasesGenerated") { model("uncommonCases/testFiles", testMethod = "doUncommonCasesTest") } diff --git a/compiler/visualizer/build.gradle.kts b/compiler/visualizer/build.gradle.kts index 8cc0b7898b1..d3c477e48af 100644 --- a/compiler/visualizer/build.gradle.kts +++ b/compiler/visualizer/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.ideaExt.idea + plugins { kotlin("jvm") id("jps-compatible") @@ -17,13 +19,25 @@ dependencies { testCompile(projectTests(":compiler:fir:analysis-tests")) } +val generationRoot = projectDir.resolve("tests-gen") + sourceSets { - "main" {} - "test" { projectDefault() } + "main" { projectDefault() } + "test" { + projectDefault() + this.java.srcDir(generationRoot.name) + } +} + +if (kotlinBuildProperties.isInJpsBuildIdeaSync) { + apply(plugin = "idea") + idea { + this.module.generatedSourceDirs.add(generationRoot) + } } projectTest { workingDir = rootDir } -testsJar() \ No newline at end of file +testsJar() diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForRawFirDataGenerated.java b/compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForRawFirDataGenerated.java similarity index 100% rename from compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForRawFirDataGenerated.java rename to compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForRawFirDataGenerated.java diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForUncommonCasesGenerated.java b/compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForUncommonCasesGenerated.java similarity index 100% rename from compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForUncommonCasesGenerated.java rename to compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForUncommonCasesGenerated.java diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForRawFirDataGenerated.java b/compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForRawFirDataGenerated.java similarity index 100% rename from compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForRawFirDataGenerated.java rename to compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForRawFirDataGenerated.java diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForUncommonCasesGenerated.java b/compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForUncommonCasesGenerated.java similarity index 100% rename from compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForUncommonCasesGenerated.java rename to compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForUncommonCasesGenerated.java