feat(devins-cpp): refactor for factory usage #100

unit-mesh · Mar 25, 2024 · 9dd5c48 · 9dd5c48
1 parent 23865dd
commit 9dd5c48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/cpp/src/main/kotlin/cc/unitmesh/cpp/provider/testing/CppAutoTestService.kt b/cpp/src/main/kotlin/cc/unitmesh/cpp/provider/testing/CppAutoTestService.kt
@@ -12,6 +12,7 @@ import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import com.jetbrains.cidr.cpp.execution.testing.tcatch.CMakeCatchTestRunConfigurationType
 import com.jetbrains.cidr.lang.OCLanguage
 import com.jetbrains.cidr.lang.psi.OCFunctionDeclaration
 import java.io.File
@@ -32,7 +33,8 @@ class CppAutoTestService : AutoTestService() {
             return null
         }
 
-        val settings = CppTestConfiguration.createConfiguration(project, virtualFile).firstOrNull()
+        val factory = CMakeCatchTestRunConfigurationType.getInstance().factory
+        val settings = CppTestConfiguration.createConfiguration(project, virtualFile, factory).firstOrNull()
         return settings?.configuration
     }
 

diff --git a/cpp/src/main/kotlin/cc/unitmesh/cpp/provider/testing/CppTestConfiguration.kt b/cpp/src/main/kotlin/cc/unitmesh/cpp/provider/testing/CppTestConfiguration.kt
@@ -9,18 +9,14 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.jetbrains.cidr.cpp.cmake.model.CMakeTarget
 import com.jetbrains.cidr.cpp.cmake.workspace.CMakeWorkspace
 import com.jetbrains.cidr.cpp.execution.testing.CMakeTestRunConfiguration
-import com.jetbrains.cidr.cpp.execution.testing.tcatch.CMakeCatchTestRunConfigurationType
 import com.jetbrains.cidr.execution.ExecutableData
 import com.jetbrains.cidr.execution.BuildTargetData
 import com.jetbrains.cidr.execution.BuildTargetAndConfigurationData
 
 object CppTestConfiguration {
-    fun createConfiguration(project: Project, file: VirtualFile): List<RunnerAndConfigurationSettings> {
-        val catchFactory = CMakeCatchTestRunConfigurationType.getInstance().factory
-        val factory = catchFactory ?: return emptyList()
+    fun createConfiguration(project: Project, file: VirtualFile, configurationFactory: ConfigurationFactory): List<RunnerAndConfigurationSettings> {
         val targets = getAllCmakeTargetsForTestFiles(project, file)
-
-        return targets.map { createConfiguration(project, it, factory) }
+        return targets.map { createConfiguration(project, it, configurationFactory) }
     }
 
     private fun getAllCmakeTargetsForTestFiles(project: Project, file: VirtualFile): List<CMakeTarget> {
@@ -35,7 +31,6 @@ object CppTestConfiguration {
         return listOfNotNull(targets)
     }
 
-
     fun createConfiguration(
         project: Project,
         cMakeTarget: CMakeTarget,