From bc7cc6b5a9b04c6104b6962524bbb30f46c70245 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 5 Oct 2021 14:34:43 +0300 Subject: [PATCH] Move generated parcelize tests to tests-gen directory --- .../kotlin/generators/tests/GenerateTests.kt | 2 +- .../parcelize-compiler/build.gradle.kts | 16 +++++++++++++++- .../test/ParcelizeBoxTestGenerated.java | 0 .../ParcelizeBytecodeListingTestGenerated.java | 0 .../test/ParcelizeIrBoxTestGenerated.java | 0 .../ParcelizeIrBytecodeListingTestGenerated.java | 0 6 files changed, 16 insertions(+), 2 deletions(-) rename plugins/parcelize/parcelize-compiler/{tests => tests-gen}/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java (100%) rename plugins/parcelize/parcelize-compiler/{tests => tests-gen}/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java (100%) rename plugins/parcelize/parcelize-compiler/{tests => tests-gen}/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java (100%) rename plugins/parcelize/parcelize-compiler/{tests => tests-gen}/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java (100%) diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 136399a7981..f8377a2b2de 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -147,7 +147,7 @@ fun main(args: Array) { } } - testGroup("plugins/parcelize/parcelize-compiler/tests", "plugins/parcelize/parcelize-compiler/testData") { + testGroup("plugins/parcelize/parcelize-compiler/tests-gen", "plugins/parcelize/parcelize-compiler/testData") { testClass { model("box", targetBackend = TargetBackend.JVM) } diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts index 21410dfc6e0..7c78b752636 100644 --- a/plugins/parcelize/parcelize-compiler/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.ideaExt.idea + description = "Parcelize compiler plugin" plugins { @@ -44,9 +46,21 @@ dependencies { parcelizeRuntimeForTests(project(":kotlin-android-extensions-runtime")) { isTransitive = false } } +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) + } } runtimeJar() diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java similarity index 100% rename from plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java rename to plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeBoxTestGenerated.java diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java similarity index 100% rename from plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java rename to plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeBytecodeListingTestGenerated.java diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java similarity index 100% rename from plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java rename to plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBoxTestGenerated.java diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java similarity index 100% rename from plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java rename to plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/ParcelizeIrBytecodeListingTestGenerated.java