Skip to content

Commit 69ec429

Browse files
Vassiliy-KudryashovEgorkaKulikov
authored andcommitted
UI. Gradle project. Suggest all Test sources roots for test generation #549
1 parent 0bbae2a commit 69ec429

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ import org.utbot.intellij.plugin.ui.utils.addSourceRootIfAbsent
130130
import org.utbot.intellij.plugin.ui.utils.allLibraries
131131
import org.utbot.intellij.plugin.ui.utils.findFrameworkLibrary
132132
import org.utbot.intellij.plugin.ui.utils.getOrCreateTestResourcesPath
133+
import org.utbot.intellij.plugin.ui.utils.isGradle
133134
import org.utbot.intellij.plugin.ui.utils.kotlinTargetPlatform
134135
import org.utbot.intellij.plugin.ui.utils.parseVersion
135136
import org.utbot.intellij.plugin.ui.utils.testResourceRootTypes
@@ -435,7 +436,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
435436
val testRoot = getTestRoot()
436437
?: return ValidationInfo("Test source root is not configured", testSourceFolderField.childComponent)
437438

438-
if (findReadOnlyContentEntry(testRoot) == null) {
439+
if (!model.project.isGradle() && findReadOnlyContentEntry(testRoot) == null) {
439440
return ValidationInfo("Test source root is located out of content entry", testSourceFolderField.childComponent)
440441
}
441442

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.intellij.util.ArrayUtil
1313
import java.io.File
1414
import javax.swing.DefaultComboBoxModel
1515
import javax.swing.JList
16+
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
1617
import org.utbot.common.PathUtil
1718
import org.utbot.intellij.plugin.models.GenerateTestsModel
1819
import org.utbot.intellij.plugin.ui.utils.addDedicatedTestRoot
@@ -50,7 +51,13 @@ class TestFolderComboWithBrowseButton(private val model: GenerateTestsModel) : C
5051
}
5152
}
5253

53-
val testRoots = model.potentialTestModules.flatMap { it.suitableTestSourceRoots().toMutableList() }.toMutableList()
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+
}
5461

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

0 commit comments

Comments
 (0)