File tree 2 files changed +8
-7
lines changed
utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui
2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -51,13 +51,9 @@ class TestFolderComboWithBrowseButton(private val model: GenerateTestsModel) : C
51
51
}
52
52
}
53
53
54
- val testRoots = if (model.project.isGradle()) {
55
- val allRoots = mutableSetOf<VirtualFile >()
56
- model.project.allModules().map { it.suitableTestSourceRoots() }.forEach(allRoots::addAll)
57
- allRoots.toMutableList()
58
- } else {
59
- model.potentialTestModules.flatMap { it.suitableTestSourceRoots().toMutableList() }.toMutableList()
60
- }
54
+ val testRoots = model.potentialTestModules
55
+ .flatMap { it.suitableTestSourceRoots().toList() }
56
+ .toMutableList()
61
57
62
58
// this method is blocked for Gradle, where multiple test modules can exist
63
59
model.testModule.addDedicatedTestRoot(testRoots)
Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ import org.jetbrains.android.sdk.AndroidSdkType
31
31
import org.jetbrains.jps.model.module.JpsModuleSourceRootType
32
32
import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
33
33
import org.jetbrains.kotlin.config.TestResourceKotlinRootType
34
+ import org.jetbrains.kotlin.idea.util.projectStructure.allModules
34
35
import org.jetbrains.kotlin.platform.TargetPlatformVersion
35
36
36
37
private val logger = KotlinLogging .logger {}
@@ -86,6 +87,10 @@ fun Module.getOrCreateSarifReportsPath(testSourceRoot: VirtualFile?): Path {
86
87
* Find test modules by current source module.
87
88
*/
88
89
fun Module.testModules (project : Project ): List <Module > {
90
+ if (project.isGradle()) {
91
+ return project.allModules()
92
+ }
93
+
89
94
var testModules = findPotentialModulesForTests(project, this )
90
95
val testRootUrls = testModules.flatMap { it.suitableTestSourceRoots() }
91
96
You can’t perform that action at this time.
0 commit comments