fix(kotlin): fix kotlin test method issue #1

unit-mesh · Dec 28, 2023 · 0ecb7b8 · 0ecb7b8
1 parent 57a8a19
commit 0ecb7b8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/builder/unittest/java/ClassTestCodeBuilder.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/builder/unittest/java/ClassTestCodeBuilder.kt
@@ -48,7 +48,7 @@ class ClassTestCodeBuilder(private val context: JobContext) : TestCodeBuilder {
             BasicTestIns(
                 identifier = NodeIdentifier(
                     type = NodeType.CLASS,
-                    name = dataStruct.NodeName,
+                    name = underTestFile.NodeName,
                 ),
                 language = context.project.language,
                 underTestCode = underTestFile.Content,

diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/builder/unittest/java/JavaTestCodeService.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/builder/unittest/java/JavaTestCodeService.kt
@@ -1,5 +1,6 @@
 package cc.unitmesh.pick.builder.unittest.java
 
+import cc.unitmesh.core.SupportedLang
 import cc.unitmesh.core.unittest.TypedTestIns
 import cc.unitmesh.pick.builder.unittest.base.UnitTestService
 import cc.unitmesh.pick.worker.job.InstructionFileJob
@@ -10,7 +11,7 @@ import chapi.domain.core.CodeImport
 
 open class JavaTestCodeService(open val context: JobContext) : UnitTestService {
     override fun isApplicable(dataStruct: CodeDataStruct): Boolean {
-        return dataStruct.NodeName.endsWith("Test") || dataStruct.NodeName.endsWith("Tests")
+        return context.project.language == SupportedLang.JAVA && dataStruct.NodeName.endsWith("Test") || dataStruct.NodeName.endsWith("Tests")
     }
 
     /**

diff --git a/...r/src/main/kotlin/cc/unitmesh/pick/builder/unittest/kotlin/KotlinMethodTestCodeBuilder.kt b/...r/src/main/kotlin/cc/unitmesh/pick/builder/unittest/kotlin/KotlinMethodTestCodeBuilder.kt
@@ -10,6 +10,7 @@ import cc.unitmesh.pick.ext.toSourceCode
 import cc.unitmesh.pick.ext.toUml
 import cc.unitmesh.pick.worker.job.JobContext
 import chapi.domain.core.CodeDataStruct
+import chapi.domain.core.DataStructType
 
 /**
  * 为给定的 CodeDataStruct 的每个 CodeFunction 生成测试指令。
@@ -36,7 +37,9 @@ class KotlinMethodTestCodeBuilder(private val context: JobContext) : TestCodeBui
         // 分析测试代码，找到原始函数的代码内容，放到结果中
         dataStruct.Functions.mapIndexed { _, function ->
             underTestFile.Functions.map {
-                if (!function.Content.contains("." + it.Name + "(")) {
+                val isNotClassCall = underTestFile.Type == DataStructType.CLASS && !function.Content.contains("." + it.Name + "(")
+                val isNotObjectCall = underTestFile.Type == DataStructType.OBJECT && !function.Content.contains(it.Name + "(")
+                if (isNotClassCall || isNotObjectCall) {
                     return@map
                 }
 

diff --git a/...-picker/src/main/kotlin/cc/unitmesh/pick/builder/unittest/kotlin/KotlinTestCodeService.kt b/...-picker/src/main/kotlin/cc/unitmesh/pick/builder/unittest/kotlin/KotlinTestCodeService.kt
@@ -1,8 +1,8 @@
 package cc.unitmesh.pick.builder.unittest.kotlin
 
+import cc.unitmesh.core.SupportedLang
 import cc.unitmesh.core.unittest.TypedTestIns
 import cc.unitmesh.pick.builder.unittest.java.ClassTestCodeBuilder
-import cc.unitmesh.pick.builder.unittest.java.JavaMethodTestCodeBuilder
 import cc.unitmesh.pick.builder.unittest.java.JavaTestCodeService
 import cc.unitmesh.pick.worker.job.JobContext
 import chapi.domain.core.CodeDataStruct
@@ -11,6 +11,10 @@ import chapi.domain.core.CodeDataStruct
  * 为给定的 CodeDataStruct 的每个 CodeFunction 生成测试指令。
  */
 class KotlinTestCodeService(override val context: JobContext) : JavaTestCodeService(context) {
+    override fun isApplicable(dataStruct: CodeDataStruct): Boolean {
+        return context.project.language == SupportedLang.KOTLIN && dataStruct.NodeName.endsWith("Test") || dataStruct.NodeName.endsWith("Tests")
+    }
+
     override fun build(dataStruct: CodeDataStruct): List<TypedTestIns> {
         val underTestFile = this.findUnderTestFile(dataStruct).firstOrNull() ?: return emptyList()
         val relevantClasses = this.lookupRelevantClass(dataStruct)