File tree 3 files changed +11
-2
lines changed
utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui
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
130
130
import org.utbot.intellij.plugin.ui.utils.allLibraries
131
131
import org.utbot.intellij.plugin.ui.utils.findFrameworkLibrary
132
132
import org.utbot.intellij.plugin.ui.utils.getOrCreateTestResourcesPath
133
+ import org.utbot.intellij.plugin.ui.utils.isGradle
133
134
import org.utbot.intellij.plugin.ui.utils.kotlinTargetPlatform
134
135
import org.utbot.intellij.plugin.ui.utils.parseVersion
135
136
import org.utbot.intellij.plugin.ui.utils.testResourceRootTypes
@@ -435,7 +436,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
435
436
val testRoot = getTestRoot()
436
437
? : return ValidationInfo (" Test source root is not configured" , testSourceFolderField.childComponent)
437
438
438
- if (findReadOnlyContentEntry(testRoot) == null ) {
439
+ if (! model.project.isGradle() && findReadOnlyContentEntry(testRoot) == null ) {
439
440
return ValidationInfo (" Test source root is located out of content entry" , testSourceFolderField.childComponent)
440
441
}
441
442
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ import com.intellij.util.ArrayUtil
13
13
import java.io.File
14
14
import javax.swing.DefaultComboBoxModel
15
15
import javax.swing.JList
16
+ import org.jetbrains.kotlin.idea.util.projectStructure.allModules
16
17
import org.utbot.common.PathUtil
17
18
import org.utbot.intellij.plugin.models.GenerateTestsModel
18
19
import org.utbot.intellij.plugin.ui.utils.addDedicatedTestRoot
@@ -50,7 +51,9 @@ class TestFolderComboWithBrowseButton(private val model: GenerateTestsModel) : C
50
51
}
51
52
}
52
53
53
- val testRoots = model.potentialTestModules.flatMap { it.suitableTestSourceRoots().toMutableList() }.toMutableList()
54
+ val testRoots = model.potentialTestModules
55
+ .flatMap { it.suitableTestSourceRoots().toList() }
56
+ .toMutableList()
54
57
55
58
// this method is blocked for Gradle, where multiple test modules can exist
56
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