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 e19369e162b..704b3d7adde 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,8 +23,9 @@ class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtens override val mode: Mode get() = Mode.ALL_IN_ANNOTATED_ELEMENT - override val annotations: Set = setOf(FqName.fromSegments(listOf("org", "jetbrains", "kotlin", "fir", "allopen", "AllOpen"))) + override val annotations: Set = + setOf(FqName("org.jetbrains.kotlin.fir.allopen.AllOpen")) - override val metaAnnotations: Set - get() = emptySet() + override val metaAnnotations: Set = + setOf(FqName("org.jetbrains.kotlin.fir.allopen.AllOpen")) } \ No newline at end of file diff --git a/compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.kt b/compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.kt new file mode 100644 index 00000000000..b208308741e --- /dev/null +++ b/compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.kt @@ -0,0 +1,18 @@ +import org.jetbrains.kotlin.fir.allopen.AllOpen + +@Open +class A { + fun foo() { + + } +} + +@Open +class B : A() { + override fun foo() { + + } +} + +@AllOpen +annotation class Open \ No newline at end of file diff --git a/compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.txt b/compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.txt new file mode 100644 index 00000000000..a7de64dd2fc --- /dev/null +++ b/compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.txt @@ -0,0 +1,25 @@ +FILE: metaAnnotation.kt + @R|Open|() public open class A : R|kotlin/Any| { + public constructor(): R|A| { + super() + } + + public open fun foo(): R|kotlin/Unit| { + } + + } + @R|Open|() public open class B : R|A| { + public constructor(): R|B| { + super() + } + + public open override fun foo(): R|kotlin/Unit| { + } + + } + @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open annotation class Open : R|kotlin/Annotation| { + public constructor(): R|Open| { + super() + } + + } diff --git a/compiler/fir/plugins/allopen-plugin/testData/simple.kt b/compiler/fir/plugins/allopen-plugin/testData/status/simpleAnnotation.kt similarity index 100% rename from compiler/fir/plugins/allopen-plugin/testData/simple.kt rename to compiler/fir/plugins/allopen-plugin/testData/status/simpleAnnotation.kt diff --git a/compiler/fir/plugins/allopen-plugin/testData/simple.txt b/compiler/fir/plugins/allopen-plugin/testData/status/simpleAnnotation.txt similarity index 94% rename from compiler/fir/plugins/allopen-plugin/testData/simple.txt rename to compiler/fir/plugins/allopen-plugin/testData/status/simpleAnnotation.txt index 500a560ac4a..ead835c7398 100644 --- a/compiler/fir/plugins/allopen-plugin/testData/simple.txt +++ b/compiler/fir/plugins/allopen-plugin/testData/status/simpleAnnotation.txt @@ -1,4 +1,4 @@ -FILE: simple.kt +FILE: simpleAnnotation.kt @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open class A : R|kotlin/Any| { public constructor(): R|A| { super() diff --git a/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/FirAllOpenDiagnosticTestGenerated.java b/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/FirAllOpenDiagnosticTestGenerated.java index a94aef59aa2..33c4f80a469 100644 --- a/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/FirAllOpenDiagnosticTestGenerated.java +++ b/compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/FirAllOpenDiagnosticTestGenerated.java @@ -28,8 +28,26 @@ public class FirAllOpenDiagnosticTestGenerated extends AbstractFirAllOpenDiagnos KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/plugins/allopen-plugin/testData"), Pattern.compile("^(.+)\\.kt$"), null, true); } - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/fir/plugins/allopen-plugin/testData/simple.kt"); + @TestMetadata("compiler/fir/plugins/allopen-plugin/testData/status") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Status extends AbstractFirAllOpenDiagnosticTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInStatus() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/plugins/allopen-plugin/testData/status"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @TestMetadata("metaAnnotation.kt") + public void testMetaAnnotation() throws Exception { + runTest("compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.kt"); + } + + @TestMetadata("simpleAnnotation.kt") + public void testSimpleAnnotation() throws Exception { + runTest("compiler/fir/plugins/allopen-plugin/testData/status/simpleAnnotation.kt"); + } } }