Replace PsiClassHelper.kt

Author: sofurihafe

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt

@@ -241,7 +241,7 @@ object UtTestsDialogProcessor {
                         val totalClasses = model.srcClasses.size
                         val classNameToPath = runReadAction {
                             model.srcClasses.associate { psiClass ->
-                                psiClass.binaryName() to psiClass.containingFile.virtualFile.canonicalPath
+                                psiClass.binaryName to psiClass.containingFile.virtualFile.canonicalPath
                             }
                         }
 
@@ -320,7 +320,7 @@ object UtTestsDialogProcessor {
                                     var srcNameForLog: String? = null
                                     DumbService.getInstance(project)
                                         .runReadActionInSmartMode(Computable {
-                                            binaryName = srcClass.binaryName()
+                                            binaryName = srcClass.binaryName
                                             srcNameForLog = srcClass.name
                                             srcMethods = if (model.extractMembersFromSrcClasses) {
                                                 val chosenMethods =

utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/models/BaseTestModel.kt

@@ -134,7 +134,7 @@ open class BaseTestsModel(
             .searchPsiClasses(annotationClass, searchScope)
             .findAll()
             .sortedBy { testRootToIndex[it.containingFile.sourceRoot] ?: Int.MAX_VALUE }
-            .mapNotNullTo(mutableSetOf()) { it.binaryName() }
+            .mapNotNullTo(mutableSetOf()) { it.binaryName }
     }
 
     fun getSpringXMLConfigurationFiles(): Set<String> {

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt renamed to utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt

@@ -17,6 +17,26 @@ import org.jetbrains.kotlin.asJava.elements.isSetter
 import org.jetbrains.kotlin.psi.KtClass
 import org.utbot.common.filterWhen
 import org.utbot.framework.UtSettings
+import org.utbot.intellij.plugin.models.packageName
+
+/**
+ * Used to build binary name from canonical name
+ * in a similar form which could be obtained by [java.lang.Class.getName] method.
+ *
+ * E.g. ```org.example.OuterClass.InnerClass.InnerInnerClass``` -> ```org.example.OuterClass$InnerClass$InnerInnerClass```
+ */
+val PsiClass.binaryName: String
+    get() =
+        if (packageName.isEmpty()) {
+            qualifiedName?.replace(".", "$") ?: ""
+        } else {
+            val name =
+                qualifiedName
+                    ?.substringAfter("$packageName.")
+                    ?.replace(".", "$")
+                    ?: error("Binary name construction failed: unable to get qualified name of $this")
+            "$packageName.$name"
+        }
 
 val PsiMember.isAbstract: Boolean
     get() = modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false