WIP: Parameterise new test generators with generator file name
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
index ad1b4d3..d3db46b 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
@@ -64,7 +64,7 @@
}
}
- generateTestGroupSuiteWithJUnit5 {
+ generateTestGroupSuiteWithJUnit5(testGeneratorName = "GenerateSpecTests.kt") {
testGroup(testsRoot = "compiler/fir/analysis-tests/tests-gen", testDataRoot = SPEC_TESTDATA_PATH) {
testClass<AbstractFirDiagnosticTestSpec> {
model(
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt
index 8d961ad..b1a60f8 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt
@@ -10,7 +10,7 @@
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
- generateTestGroupSuiteWithJUnit5(args) {
+ generateTestGroupSuiteWithJUnit5(args, testGeneratorName = "GenerateVisualizerTests.kt") {
testGroup("compiler/visualizer/tests-gen", "compiler/testData") {
testClass<AbstractVisualizerBlackBoxTest>() {
model("codegen/box")
diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
index d64a327..8d1711c2 100644
--- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
+++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
@@ -10,7 +10,7 @@
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
- generate(args) {
+ generate("GenerateAnalysApiTests.kt", args) {
generateTests()
}
}
diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/AnalysisApiTestGenerator.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/AnalysisApiTestGenerator.kt
index fe5cf45..23f9b5a 100644
--- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/AnalysisApiTestGenerator.kt
+++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/AnalysisApiTestGenerator.kt
@@ -14,8 +14,8 @@
}
}
-internal fun generate(args: Array<String>, init: AnalysisApiTestGroup.() -> Unit) {
- generateTestGroupSuiteWithJUnit5(args, additionalMethodGenerators = listOf(FrontendConfiguratorTestGenerator)) {
+internal fun generate(testGeneratorName: String, args: Array<String>, init: AnalysisApiTestGroup.() -> Unit) {
+ generateTestGroupSuiteWithJUnit5(args, testGeneratorName, additionalMethodGenerators = listOf(FrontendConfiguratorTestGenerator)) {
AnalysisApiTestGenerator(this).group(init)
}
}
\ No newline at end of file
diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGenerationDSL.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGenerationDSL.kt
index 87eb9c3..c251e29 100644
--- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGenerationDSL.kt
+++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGenerationDSL.kt
@@ -7,13 +7,15 @@
fun generateTestGroupSuiteWithJUnit5(
args: Array<String>,
+ testGeneratorName: String,
additionalMethodGenerators: List<MethodGenerator<Nothing>> = emptyList(),
init: TestGroupSuite.() -> Unit
) {
- generateTestGroupSuiteWithJUnit5(InconsistencyChecker.hasDryRunArg(args), additionalMethodGenerators, init)
+ generateTestGroupSuiteWithJUnit5(testGeneratorName, InconsistencyChecker.hasDryRunArg(args), additionalMethodGenerators, init)
}
fun generateTestGroupSuiteWithJUnit5(
+ testGeneratorName: String,
dryRun: Boolean = false,
additionalMethodGenerators: List<MethodGenerator<Nothing>> = emptyList(),
init: TestGroupSuite.() -> Unit
@@ -21,7 +23,7 @@
val suite = TestGroupSuite(ReflectionBasedTargetBackendComputer).apply(init)
for (testGroup in suite.testGroups) {
for (testClass in testGroup.testClasses) {
- val (changed, testSourceFilePath) = NewTestGeneratorImpl(additionalMethodGenerators).generateAndSave(testClass, dryRun)
+ val (changed, testSourceFilePath) = NewTestGeneratorImpl(testGeneratorName, additionalMethodGenerators).generateAndSave(testClass, dryRun)
if (changed) {
InconsistencyChecker.inconsistencyChecker(dryRun).add(testSourceFilePath)
}
diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt
index 6a1ce23..b956467 100644
--- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt
+++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt
@@ -20,8 +20,6 @@
import java.io.File
import java.io.IOException
-private const val TEST_GENERATOR_NAME = "GenerateNewCompilerTests.kt"
-
private val METHOD_GENERATORS = listOf(
SimpleTestClassModelTestAllFilesPresentMethodGenerator,
SimpleTestMethodGenerator,
@@ -30,6 +28,7 @@
)
class NewTestGeneratorImpl(
+ val testGeneratorName: String,
additionalMethodGenerators: List<MethodGenerator<Nothing>>
) : TestGenerator(METHOD_GENERATORS + additionalMethodGenerators) {
@@ -155,7 +154,7 @@
p.println("import java.io.File;")
p.println("import java.util.regex.Pattern;")
p.println()
- p.println("/** This class is generated by {@link ", TEST_GENERATOR_NAME, "}. DO NOT MODIFY MANUALLY */")
+ p.println("/** This class is generated by {@link ", testGeneratorName, "}. DO NOT MODIFY MANUALLY */")
p.generateSuppressAllWarnings()
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 25ff363..f69563d 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -357,7 +357,7 @@
}
}
- generateTestGroupSuiteWithJUnit5 {
+ generateTestGroupSuiteWithJUnit5(testGeneratorName = "GenerateTests.kt") {
val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$"
testGroup("plugins/parcelize/parcelize-compiler/tests-gen", "plugins/parcelize/parcelize-compiler/testData") {
diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
index 3e53c57..b65cfbe 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
@@ -76,7 +76,7 @@
}
}
- generateTestGroupSuiteWithJUnit5(args) {
+ generateTestGroupSuiteWithJUnit5(args, testGeneratorName = "GenerateJsTests.kt") {
testGroup("js/js.tests/tests-gen", "js/js.translator/testData", testRunnerMethodName = "runTest0") {
testClass<AbstractBoxJsTest> {
model("box/", pattern = "^([^_](.+))\\.kt$")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java
index b624681..22e2074 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/box")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
index 60900f6..314172d 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
@@ -16,7 +16,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/box")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java
index fb9b701..adbe186 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxInline")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLegacyPrimitiveArraysBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLegacyPrimitiveArraysBoxTestGenerated.java
index 2184702..279e07c 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLegacyPrimitiveArraysBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLegacyPrimitiveArraysBoxTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/box/arrays")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java
index 03fcd91..a5ca65e 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/lineNumbers")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/MultiModuleOrderTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/MultiModuleOrderTestGenerated.java
index a8faf88..4aa4e27 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/MultiModuleOrderTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/MultiModuleOrderTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/multiModuleOrder")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTestGenerated.java
index 087b5d4..a454262 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/outputPrefixPostfix")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java
index 0dd80f5..1076bcb 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/sourcemap")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/WebDemoExamplesTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/WebDemoExamplesTestGenerated.java
index 21c1d56..e2e7898 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/WebDemoExamplesTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/WebDemoExamplesTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/webDemoExamples")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
index e5cdaba..76fd656 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/box")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrCodegenWasmJsInteropJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrCodegenWasmJsInteropJsTestGenerated.java
index 4365ac6..4dd2ffc 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrCodegenWasmJsInteropJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrCodegenWasmJsInteropJsTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxWasmJsInterop")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java
index f279b07..11b2cae 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxError")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
index 494aae4..5f52b46 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
@@ -16,7 +16,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/box")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java
index 957b8e1..e8ba6a6 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxInline")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsTypeScriptExportTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsTypeScriptExportTestGenerated.java
index 8788be3..da16570 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsTypeScriptExportTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsTypeScriptExportTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/typescript-export")
@TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrLineNumberTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrLineNumberTestGenerated.java
index 063d4a8..b4338b2 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrLineNumberTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrLineNumberTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateJsTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/lineNumbers")
@TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java
index 9b2f2e4..b87336b 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java
@@ -16,7 +16,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateNativeTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
public class InfrastructureTestGenerated extends AbstractNativeBlackBoxTest {
@Nested
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/KlibABITestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/KlibABITestGenerated.java
index b9bb0bb..6bdcafe 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/KlibABITestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/KlibABITestGenerated.java
@@ -14,7 +14,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateNativeTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/klibABI")
@TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
index 0d6ba4d..91df625 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
@@ -18,7 +18,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateNativeTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest {
@Nested
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
index b611aa6..1059a4d 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
@@ -18,7 +18,7 @@
fun main() {
System.setProperty("java.awt.headless", "true")
- generateTestGroupSuiteWithJUnit5 {
+ generateTestGroupSuiteWithJUnit5(testGeneratorName = "GenerateNativeTests.kt") {
// Codegen box tests.
testGroup("native/native.tests/tests-gen", "compiler/testData") {
testClass<AbstractNativeCodegenBoxTest>(
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/SerializationIrBoxTestGenerated.java b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/SerializationIrBoxTestGenerated.java
index 5f83253..5a7fcff 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/SerializationIrBoxTestGenerated.java
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/SerializationIrBoxTestGenerated.java
@@ -15,7 +15,7 @@
import java.io.File;
import java.util.regex.Pattern;
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link TestGenerator.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("plugins/kotlin-serialization/kotlin-serialization-compiler/testData/boxIr")
@TestDataPath("$PROJECT_ROOT")
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt
index c26e812..3cb1e02 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt
@@ -10,7 +10,7 @@
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
- generateTestGroupSuiteWithJUnit5(args) {
+ generateTestGroupSuiteWithJUnit5(args, testGeneratorName = "TestGenerator.kt") {
testGroup(
"plugins/kotlin-serialization/kotlin-serialization-compiler/test",
"plugins/kotlin-serialization/kotlin-serialization-compiler/testData"
