Skip to content

Test sources root out of project can be selected #1059 #1238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Test sources root out of project can be selected #1059 #1238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...rc/main/kotlin/org/utbot/intellij/plugin/ui/components/TestFolderComboWithBrowseButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.utbot.intellij.plugin.ui.components
import com.intellij.openapi.application.ReadAction
import com.intellij.openapi.fileChooser.FileChooser
import com.intellij.openapi.fileChooser.FileChooserDescriptor
import com.intellij.openapi.module.ModuleUtil
import com.intellij.openapi.project.guessProjectDir
import com.intellij.openapi.ui.ComboBox
import com.intellij.openapi.ui.ComponentWithBrowseButton
Expand Down Expand Up @@ -81,7 +82,7 @@ class TestFolderComboWithBrowseButton(private val model: GenerateTestsModel) :
}

addActionListener {
val testSourceRoot = createNewTestSourceRoot(model)
val testSourceRoot = chooseTestRoot(model)
testSourceRoot?.let {
model.setSourceRootAndFindTestModule(it)

Expand All @@ -97,9 +98,13 @@ class TestFolderComboWithBrowseButton(private val model: GenerateTestsModel) :
}
}

private fun createNewTestSourceRoot(model: GenerateTestsModel): VirtualFile? =
private fun chooseTestRoot(model: GenerateTestsModel): VirtualFile? =
ReadAction.compute<VirtualFile, RuntimeException> {
val desc = FileChooserDescriptor(false, true, false, false, false, false)
val desc = object:FileChooserDescriptor(false, true, false, false, false, false) {
override fun isFileSelectable(file: VirtualFile?): Boolean {
return file != null && ModuleUtil.findModuleForFile(file, model.project) != null && super.isFileSelectable(file)
}
}
val initialFile = model.project.guessProjectDir()

val files = FileChooser.chooseFiles(desc, model.project, initialFile)
Expand Down