From 60dcafcf4379cee84f5d56a1b1503b87b9f42cbb Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 13 Dec 2021 18:12:29 +0300 Subject: [PATCH] [Test] TestGen: Use canonical class names for generated imports This is needed to have correct class names for inner/nested classes. For example, to have `import java.util.AbstractMap.SimpleEntry` instead of `import java.util.AbstractMap$SimpleEntry`. --- .../org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt | 2 +- .../org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt index d84073af5d6..040a9cdc0d1 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt @@ -127,7 +127,7 @@ private class TestGeneratorImplInstance( val realName = when (clazz) { TransformingTestMethodModel.TransformerFunctionsClassPlaceHolder::class.java -> "org.jetbrains.kotlin.test.utils.TransformersFunctions" - else -> clazz.name + else -> clazz.canonicalName } p.println("import $realName;") } 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 2124def83f6..22ba13f0b0f 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt @@ -132,7 +132,7 @@ object NewTestGeneratorImpl : TestGenerator(METHOD_GENERATORS) { val realName = when (clazz) { TransformingTestMethodModel.TransformerFunctionsClassPlaceHolder::class.java -> "org.jetbrains.kotlin.test.utils.TransformersFunctions" - else -> clazz.name + else -> clazz.canonicalName } p.println("import $realName;") }