Skip to content

Commit 9d08805

Browse files
committed
Attempts to improve the logic
1 parent 69ec429 commit 9d08805

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/components/TestFolderComboWithBrowseButton.kt

+3-7
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,9 @@ class TestFolderComboWithBrowseButton(private val model: GenerateTestsModel) : C
5151
}
5252
}
5353

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()
6157

6258
// this method is blocked for Gradle, where multiple test modules can exist
6359
model.testModule.addDedicatedTestRoot(testRoots)

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/ModuleUtils.kt

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import org.jetbrains.android.sdk.AndroidSdkType
3131
import org.jetbrains.jps.model.module.JpsModuleSourceRootType
3232
import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
3333
import org.jetbrains.kotlin.config.TestResourceKotlinRootType
34+
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
3435
import org.jetbrains.kotlin.platform.TargetPlatformVersion
3536

3637
private val logger = KotlinLogging.logger {}
@@ -86,6 +87,10 @@ fun Module.getOrCreateSarifReportsPath(testSourceRoot: VirtualFile?): Path {
8687
* Find test modules by current source module.
8788
*/
8889
fun Module.testModules(project: Project): List<Module> {
90+
if (project.isGradle()) {
91+
return project.allModules()
92+
}
93+
8994
var testModules = findPotentialModulesForTests(project, this)
9095
val testRootUrls = testModules.flatMap { it.suitableTestSourceRoots() }
9196

0 commit comments

Comments
 (0)