[Tests] Set tags and annotations to multi-model testrunner class

Merge-request: KT-MR-20292 Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
JetBrains · Feb 20, 2025 · ed6f20c · ed6f20c
1 parent 94de4ec
commit ed6f20c
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 2 deletions.
diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt
@@ -191,13 +191,15 @@ class NewTestGeneratorImpl(
                         get() = null
 
                     override val annotations: Collection<AnnotationModel>
-                        get() = emptyList()
+                        // models have same annotations, so either distinct() or intersect() yield same result
+                        get() = testClassModels.flatMap { it.annotations }.distinct()
 
                     override val imports: Set<Class<*>>
                         get() = super.imports
 
                     override val tags: List<String>
-                        get() = emptyList()
+                        // models have same tags, so either distinct() or intersect() yield same result
+                        get() = testClassModels.flatMap { it.tags }.distinct()
                 }
             }
 

diff --git a/...ains/kotlin/konan/test/blackbox/FirNativeCodegenBoxWithInlinedFunInKlibTestGenerated.java b/...ains/kotlin/konan/test/blackbox/FirNativeCodegenBoxWithInlinedFunInKlibTestGenerated.java
diff --git a/...tbrains/kotlin/konan/test/diagnostics/FirLightTreeNativeKlibDiagnosticsTestGenerated.java b/...tbrains/kotlin/konan/test/diagnostics/FirLightTreeNativeKlibDiagnosticsTestGenerated.java
diff --git a/...org/jetbrains/kotlin/konan/test/diagnostics/FirPsiNativeKlibDiagnosticsTestGenerated.java b/...org/jetbrains/kotlin/konan/test/diagnostics/FirPsiNativeKlibDiagnosticsTestGenerated.java
diff --git a/...n/org/jetbrains/kotlin/konan/test/inlining/NativeUnboundIrSerializationTestGenerated.java b/...n/org/jetbrains/kotlin/konan/test/inlining/NativeUnboundIrSerializationTestGenerated.java
diff --git a/...sts/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropFModulesTestGenerated.java b/...sts/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropFModulesTestGenerated.java
diff --git a/...s/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropNoFModulesTestGenerated.java b/...s/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropNoFModulesTestGenerated.java
diff --git a/...ts/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirInfrastructureTestGenerated.java b/...ts/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirInfrastructureTestGenerated.java
diff --git a/.../tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java b/.../tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
diff --git a/...ts-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java b/...ts-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
diff --git a/...tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureTestGenerated.java b/...tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureTestGenerated.java
diff --git a/...sts/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java b/...sts/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
diff --git a/...tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java b/...tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java