From ce4d2093cc288f80d22567bb9e5ee67714de7b84 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Thu, 11 Nov 2021 14:50:18 +0300
Subject: [PATCH] [Native][tests] Use the single 'generateTests' task

---
 native/native.tests/build.gradle.kts          | 15 ++--------
 .../NativeExtBlackBoxTestGenerated.java       |  0
 .../tests/GenerateExtNativeBlackboxTests.kt   | 29 -------------------
 .../tests/GenerateNativeBlackboxTests.kt      | 16 ++++++++++
 4 files changed, 19 insertions(+), 41 deletions(-)
 rename native/native.tests/{ext-tests-gen => tests-gen}/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java (100%)
 delete mode 100644 native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateExtNativeBlackboxTests.kt

diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts
index 37aa53825a4..05f65af0cf9 100644
--- a/native/native.tests/build.gradle.kts
+++ b/native/native.tests/build.gradle.kts
@@ -23,20 +23,19 @@ dependencies {
 }
 
 val generationRoot = projectDir.resolve("tests-gen")
-val extGenerationRoot = projectDir.resolve("ext-tests-gen")
 
 sourceSets {
     "main" { none() }
     "test" {
         projectDefault()
-        java.srcDirs(generationRoot.name, extGenerationRoot.name)
+        java.srcDirs(generationRoot.name)
     }
 }
 
 if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     apply(plugin = "idea")
     idea {
-        module.generatedSourceDirs.addAll(listOf(generationRoot, extGenerationRoot))
+        module.generatedSourceDirs.addAll(listOf(generationRoot))
     }
 }
 
@@ -86,15 +85,7 @@ if (kotlinBuildProperties.isKotlinNativeEnabled) {
     }
 }
 
-val generateOwnTests by generator("org.jetbrains.kotlin.generators.tests.GenerateNativeBlackboxTestsKt") {
-    javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_11))
-}
-
-val generateExtTests by generator("org.jetbrains.kotlin.generators.tests.GenerateExtNativeBlackboxTestsKt") {
+val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateNativeBlackboxTestsKt") {
     javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_11))
     dependsOn(":compiler:generateTestData")
 }
-
-val generateTests by tasks.creating<Task> {
-    dependsOn(generateOwnTests, generateExtTests)
-}
diff --git a/native/native.tests/ext-tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java
similarity index 100%
rename from native/native.tests/ext-tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java
rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateExtNativeBlackboxTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateExtNativeBlackboxTests.kt
deleted file mode 100644
index 018ecec78d5..00000000000
--- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateExtNativeBlackboxTests.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.generators.tests
-
-import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
-import org.jetbrains.kotlin.generators.model.annotation
-import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeBlackBoxTest
-import org.jetbrains.kotlin.konan.blackboxtest.group.ExtTestCaseGroupProvider
-
-fun main() {
-    System.setProperty("java.awt.headless", "true")
-
-    generateTestGroupSuiteWithJUnit5 {
-        testGroup("native/native.tests/ext-tests-gen", "compiler/testData") {
-            testClass<AbstractNativeBlackBoxTest>(
-                suiteTestClassName = "NativeExtBlackBoxTestGenerated",
-                annotations = listOf(
-                    annotation(CustomNativeBlackBoxTestCaseGroupProvider::class.java, ExtTestCaseGroupProvider::class.java)
-                )
-            ) {
-                model("codegen/box")
-                model("codegen/boxInline")
-            }
-        }
-    }
-}
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 47afad7415e..5d160b3aa95 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
@@ -6,12 +6,28 @@
 package org.jetbrains.kotlin.generators.tests
 
 import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
+import org.jetbrains.kotlin.generators.model.annotation
 import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeBlackBoxTest
+import org.jetbrains.kotlin.konan.blackboxtest.group.ExtTestCaseGroupProvider
 
 fun main() {
     System.setProperty("java.awt.headless", "true")
 
     generateTestGroupSuiteWithJUnit5 {
+        // External box tests.
+        testGroup("native/native.tests/tests-gen", "compiler/testData") {
+            testClass<AbstractNativeBlackBoxTest>(
+                suiteTestClassName = "NativeExtBlackBoxTestGenerated",
+                annotations = listOf(
+                    annotation(CustomNativeBlackBoxTestCaseGroupProvider::class.java, ExtTestCaseGroupProvider::class.java)
+                )
+            ) {
+                model("codegen/box")
+                model("codegen/boxInline")
+            }
+        }
+
+        // Samples (how to utilize abilities of new test infrastructure).
         testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
             testClass<AbstractNativeBlackBoxTest> {
                 model("samples")