From 17434c34b4f3951f88bcc68ca67391198c99e1cc Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Wed, 29 Apr 2020 12:17:41 +0300
Subject: [PATCH] [FIR-PLUGIN] Enable lib with annotation in plugin tests

---
 .../kotlin/fir/allopen/AllOpenStatusTransformer.kt |  2 +-
 .../fir/plugins/allopen-plugin/testData/simple.kt  | 14 +++-----------
 .../fir/plugins/allopen-plugin/testData/simple.txt | 13 +++----------
 .../allopen/AbstractFirAllOpenDiagnosticTest.kt    |  8 ++++++++
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt
index d39a00e7170..e19369e162b 100644
--- a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt
+++ b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt
@@ -23,7 +23,7 @@ class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtens
     override val mode: Mode
         get() = Mode.ALL_IN_ANNOTATED_ELEMENT
 
-    override val annotations: Set<AnnotationFqn> = setOf(FqName.fromSegments(listOf("allopen", "Open")))
+    override val annotations: Set<AnnotationFqn> = setOf(FqName.fromSegments(listOf("org", "jetbrains", "kotlin", "fir", "allopen", "AllOpen")))
 
     override val metaAnnotations: Set<AnnotationFqn>
         get() = emptySet()
diff --git a/compiler/fir/plugins/allopen-plugin/testData/simple.kt b/compiler/fir/plugins/allopen-plugin/testData/simple.kt
index 24cd76b2dbb..f7da74937b3 100644
--- a/compiler/fir/plugins/allopen-plugin/testData/simple.kt
+++ b/compiler/fir/plugins/allopen-plugin/testData/simple.kt
@@ -1,21 +1,13 @@
-// FILE: annotations.kt
+import org.jetbrains.kotlin.fir.allopen.AllOpen
 
-package allopen
-
-annotation class Open
-
-// FILE: main.kt
-
-import allopen.Open
-
-@Open
+@AllOpen
 class A {
     fun foo() {
 
     }
 }
 
-@Open
+@AllOpen
 class B : A() {
     override fun foo() {
 
diff --git a/compiler/fir/plugins/allopen-plugin/testData/simple.txt b/compiler/fir/plugins/allopen-plugin/testData/simple.txt
index d5486510959..500a560ac4a 100644
--- a/compiler/fir/plugins/allopen-plugin/testData/simple.txt
+++ b/compiler/fir/plugins/allopen-plugin/testData/simple.txt
@@ -1,12 +1,5 @@
-FILE: annotations.kt
-    public final annotation class Open : R|kotlin/Annotation| {
-        public constructor(): R|allopen/Open| {
-            super<R|kotlin/Any|>()
-        }
-
-    }
-FILE: main.kt
-    @R|allopen/Open|() public open class A : R|kotlin/Any| {
+FILE: simple.kt
+    @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open class A : R|kotlin/Any| {
         public constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
@@ -15,7 +8,7 @@ FILE: main.kt
         }
 
     }
-    @R|allopen/Open|() public open class B : R|A| {
+    @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open class B : R|A| {
         public constructor(): R|B| {
             super<R|A|>()
         }
diff --git a/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/AbstractFirAllOpenDiagnosticTest.kt b/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/AbstractFirAllOpenDiagnosticTest.kt
index 0112ed32065..988cde45f93 100644
--- a/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/AbstractFirAllOpenDiagnosticTest.kt
+++ b/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/AbstractFirAllOpenDiagnosticTest.kt
@@ -5,12 +5,20 @@
 
 package org.jetbrains.kotlin.fir.allopen
 
+import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.fir.AbstractFirDiagnosticsTest
 import org.jetbrains.kotlin.fir.extensions.FirExtensionPointService
 import org.jetbrains.kotlin.fir.extensions.registerExtensions
+import java.io.File
 
 abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() {
     override fun registerFirExtensions(service: FirExtensionPointService) {
         service.registerExtensions(FirAllOpenComponentRegistrar().configure())
     }
+
+    override fun performCustomConfiguration(configuration: CompilerConfiguration) {
+        super.performCustomConfiguration(configuration)
+        configuration.addJvmClasspathRoot(File("compiler/fir/plugins/allopen-plugin/allopen-annotations/build/libs/allopen-annotations-1.4.255-SNAPSHOT.jar"))
+    }
 }
\ No newline at end of file