From 700a11747600aba0509c0c515a3e8e5d71a0a7a6 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 24 Nov 2022 10:54:33 +0200
Subject: [PATCH] [Build] Add forgotten compiler plugins tests to aggregate
 build

---
 build.gradle.kts                              | 23 +++++++++++-----
 plugins/allopen/build.gradle.kts              |  1 +
 .../accessorsStripPrefixCombined.fir.kt       | 27 -------------------
 .../accessorsStripPrefixCombined.kt           |  1 +
 4 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.fir.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 61fe765349d..fde328fd544 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -606,7 +606,6 @@ tasks {
             ":compiler:tests-spec:test",
             ":compiler:tests-against-klib:test"
         )
-        dependsOn(":plugins:jvm-abi-gen:test")
     }
 
     register("testsForBootstrapBuildTest") {
@@ -644,8 +643,6 @@ tasks {
         dependsOn(":compiler:fir:analysis-tests:test")
         dependsOn(":compiler:fir:analysis-tests:legacy-fir-tests:test")
         dependsOn(":compiler:fir:fir2ir:test")
-        dependsOn(":plugins:fir-plugin-prototype:test")
-        dependsOn(":plugins:fir-plugin-prototype:fir-plugin-ic-test:test")
     }
 
     register("firAllTest") {
@@ -656,8 +653,6 @@ tasks {
             ":compiler:fir:analysis-tests:test",
             ":compiler:fir:analysis-tests:legacy-fir-tests:test",
             ":compiler:fir:fir2ir:test",
-            ":plugins:fir-plugin-prototype:test",
-            ":plugins:fir-plugin-prototype:fir-plugin-ic-test:test"
         )
     }
 
@@ -713,8 +708,7 @@ tasks {
 
         dependsOn("jvmCompilerIntegrationTest")
 
-        dependsOn(":plugins:parcelize:parcelize-compiler:test")
-        dependsOn(":kotlinx-serialization-compiler-plugin:test")
+        dependsOn("compilerPluginTest")
 
         dependsOn(":kotlin-util-io:test")
         dependsOn(":kotlin-util-klib:test")
@@ -722,6 +716,21 @@ tasks {
         dependsOn(":generators:test")
     }
 
+    register("compilerPluginTest") {
+        dependsOn(":kotlin-allopen-compiler-plugin:test")
+        dependsOn(":kotlin-assignment-compiler-plugin:test")
+        dependsOn(":kotlinx-atomicfu-compiler-plugin:test")
+        dependsOn(":plugins:fir-plugin-prototype:test")
+        dependsOn(":plugins:fir-plugin-prototype:fir-plugin-ic-test:test")
+        dependsOn(":kotlin-imports-dumper-compiler-plugin:test")
+        dependsOn(":plugins:jvm-abi-gen:test")
+        dependsOn(":kotlinx-serialization-compiler-plugin:test")
+        dependsOn(":kotlin-lombok-compiler-plugin:test")
+        dependsOn(":kotlin-noarg-compiler-plugin:test")
+        dependsOn(":plugins:parcelize:parcelize-compiler:test")
+        dependsOn(":kotlin-sam-with-receiver-compiler-plugin:test")
+    }
+
     register("toolsTest") {
         dependsOn(":tools:kotlinp:test")
         dependsOn(":native:kotlin-klib-commonizer:test")
diff --git a/plugins/allopen/build.gradle.kts b/plugins/allopen/build.gradle.kts
index 1e60746a3cc..de5344bff35 100644
--- a/plugins/allopen/build.gradle.kts
+++ b/plugins/allopen/build.gradle.kts
@@ -47,6 +47,7 @@ javadocJar()
 testsJar()
 
 projectTest(parallel = true) {
+    dependsOn(":dist")
     workingDir = rootDir
     useJUnitPlatform()
 }
diff --git a/plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.fir.kt b/plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.fir.kt
deleted file mode 100644
index 0b70ade3618..00000000000
--- a/plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.fir.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-// KT-46529
-
-// FILE: PrefixJava.java
-
-import lombok.*;
-import lombok.experimental.*;
-
-@Getter @Setter @Accessors(chain = false, fluent = true, prefix = {"pxo"})
-public class PrefixJava {
-    private String pxaPropA = "A";
-    @Accessors(chain = true) private String pxoPropC = "C";
-    @Accessors private String pxaPropD = "D";
-}
-
-
-// FILE: test.kt
-
-fun test() {
-    //not generated because doesn't have prefix from class level @Accessors
-    assertEquals(<!ARGUMENT_TYPE_MISMATCH!>PrefixJava().<!UNRESOLVED_REFERENCE!>propA<!><!>, "A")
-    //not generated because doesn't have prefix from config
-    assertEquals(<!ARGUMENT_TYPE_MISMATCH!>PrefixJava().<!UNRESOLVED_REFERENCE!>propC<!><!>, "C")
-    assertEquals(PrefixJava().propD, "D")
-}
-
-// FILE: lombok.config
-lombok.accessors.prefix += pxa
diff --git a/plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.kt b/plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.kt
index 8c8dc263f6c..62c49ca0e3e 100644
--- a/plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.kt
+++ b/plugins/lombok/testData/diagnostics/accessorsStripPrefixCombined.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // KT-46529
 
 // FILE: PrefixJava.java