File tree Expand file tree Collapse file tree 3 files changed +11
-2
lines changed
utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui Expand file tree Collapse file tree 3 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -130,6 +130,7 @@ import org.utbot.intellij.plugin.ui.utils.addSourceRootIfAbsent
130130import org.utbot.intellij.plugin.ui.utils.allLibraries
131131import org.utbot.intellij.plugin.ui.utils.findFrameworkLibrary
132132import org.utbot.intellij.plugin.ui.utils.getOrCreateTestResourcesPath
133+ import org.utbot.intellij.plugin.ui.utils.isGradle
133134import org.utbot.intellij.plugin.ui.utils.kotlinTargetPlatform
134135import org.utbot.intellij.plugin.ui.utils.parseVersion
135136import 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
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ import com.intellij.util.ArrayUtil
1313import java.io.File
1414import javax.swing.DefaultComboBoxModel
1515import javax.swing.JList
16+ import org.jetbrains.kotlin.idea.util.projectStructure.allModules
1617import org.utbot.common.PathUtil
1718import org.utbot.intellij.plugin.models.GenerateTestsModel
1819import org.utbot.intellij.plugin.ui.utils.addDedicatedTestRoot
@@ -50,7 +51,9 @@ class TestFolderComboWithBrowseButton(private val model: GenerateTestsModel) : C
5051 }
5152 }
5253
53- val testRoots = model.potentialTestModules.flatMap { it.suitableTestSourceRoots().toMutableList() }.toMutableList()
54+ val testRoots = model.potentialTestModules
55+ .flatMap { it.suitableTestSourceRoots().toList() }
56+ .toMutableList()
5457
5558 // this method is blocked for Gradle, where multiple test modules can exist
5659 model.testModule.addDedicatedTestRoot(testRoots)
Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ import org.jetbrains.android.sdk.AndroidSdkType
3131import org.jetbrains.jps.model.module.JpsModuleSourceRootType
3232import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
3333import org.jetbrains.kotlin.config.TestResourceKotlinRootType
34+ import org.jetbrains.kotlin.idea.util.projectStructure.allModules
3435import org.jetbrains.kotlin.platform.TargetPlatformVersion
3536
3637private val logger = KotlinLogging .logger {}
@@ -86,6 +87,10 @@ fun Module.getOrCreateSarifReportsPath(testSourceRoot: VirtualFile?): Path {
8687 * Find test modules by current source module.
8788 */
8889fun 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
You can’t perform that action at this time.
0 commit comments