azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use main class as test generator name

Browse Source 
Merge-request: KT-MR-7031
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
Vladimir Sukharev
2022-09-09 12:51:18 +00:00
committed by Space
parent b9501e7452
commit c8864369fd
412 changed files with 418 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt
+3 -5
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.generators.impl.SingleClassTestModelAllFilesPresente
import org.jetbrains.kotlin.generators.impl.TransformingTestMethodGenerator
import org.jetbrains.kotlin.generators.model.*
import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil
import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.getMainClassName
import org.jetbrains.kotlin.test.TestMetadata
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.jetbrains.kotlin.utils.Printer
@@ -20,8 +21,6 @@ import org.junit.jupiter.api.Test
import java.io.File
import java.io.IOException
private const val TEST_GENERATOR_NAME = "GenerateNewCompilerTests.kt"
private val METHOD_GENERATORS = listOf(
SimpleTestClassModelTestAllFilesPresentMethodGenerator,
SimpleTestMethodGenerator,
@@ -30,8 +29,7 @@ private val METHOD_GENERATORS = listOf(
)
class NewTestGeneratorImpl(
additionalMethodGenerators: List<MethodGenerator<Nothing>>,
private val generatorName: String = TEST_GENERATOR_NAME,
additionalMethodGenerators: List<MethodGenerator<Nothing>>
) : TestGenerator(METHOD_GENERATORS + additionalMethodGenerators) {
private val GENERATED_FILES = HashSet<String>()
@@ -156,7 +154,7 @@ class NewTestGeneratorImpl(
p.println("import java.io.File;")
p.println("import java.util.regex.Pattern;")
p.println()
p.println("/** This class is generated by {@link ", generatorName, "}. DO NOT MODIFY MANUALLY */")
p.println("/** This class is generated by {@link ", getMainClassName(), "}. DO NOT MODIFY MANUALLY */")
p.generateSuppressAllWarnings()
generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TestGeneratorUtil.kt
+3 -1
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.generators.util
import org.intellij.lang.annotations.Language
import kotlin.text.capitalize
import java.io.File
import java.lang.StringBuilder
@@ -35,6 +34,9 @@ object TestGeneratorUtil {
fun fileNameToJavaIdentifier(file: File): String {
return escapeForJavaIdentifier(file.name).replaceFirstChar(Char::uppercaseChar)
}
fun getMainClassName(): String? =
Throwable().stackTrace.lastOrNull()?.className
}
private val defaultPackages = listOf(