From 51a79c4592e4132c36c87178f413069a55c499e0 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Wed, 8 Dec 2021 22:23:23 +0300
Subject: [PATCH] [Native][tests] Move "samples" tests to infrastructure tests

---
 native/native.tests/build.gradle.kts                          | 4 +---
 .../kotlin/generators/tests/GenerateNativeBlackboxTests.kt    | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts
index 6b15d035786..5647ebfeaf1 100644
--- a/native/native.tests/build.gradle.kts
+++ b/native/native.tests/build.gradle.kts
@@ -103,9 +103,7 @@ fun Test.setUpBlackBoxTest(tag: String) {
 }
 
 val infrastructureTest by projectTest(taskName = "infrastructureTest", jUnitMode = JUnitMode.JUnit5) {
-    useJUnitPlatform {
-        includeTags("infrastructure")
-    }
+    setUpBlackBoxTest("infrastructure")
 }
 
 val dailyTest by projectTest(taskName = "dailyTest", jUnitMode = JUnitMode.JUnit5) {
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeBlackboxTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeBlackboxTests.kt
index 7a859988d55..813879ec662 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeBlackboxTests.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeBlackboxTests.kt
@@ -31,7 +31,8 @@ fun main() {
         // Samples (how to utilize the abilities of new test infrastructure).
         testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
             testClass<AbstractNativeBlackBoxTest>(
-                annotations = listOf(daily(), provider<UseStandardTestCaseGroupProvider>())
+                suiteTestClassName = "NativeInfraBlackBoxTestGenerated",
+                annotations = listOf(infrastructure(), provider<UseStandardTestCaseGroupProvider>())
             ) {
                 model("samples")
                 model("samples2")
@@ -42,3 +43,4 @@ fun main() {
 
 private inline fun <reified T : Annotation> provider() = annotation(T::class.java)
 private fun daily() = annotation(Tag::class.java, "daily")
+private fun infrastructure() = annotation(Tag::class.java, "infrastructure")