Skip to content

Better test source root suggestion: remove standard "src/main/" suffix #1439

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
Vassiliy-Kudryashov merged 4 commits into from
Dec 2, 2022
Merged

Better test source root suggestion: remove standard "src/main/" suffix #1439

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ad6481
Better test source root suggestion: remove standard "src/main/" suffix
Vassiliy-Kudryashov Nov 29, 2022
feb50e4
Merge branch 'main' into Vassiliy-Kudryashov/better_test_source_root_…
Vassiliy-Kudryashov Nov 30, 2022
79d710b
Add unit tests for test source roots sorting
Vassiliy-Kudryashov Dec 2, 2022
f0e13f5
Merge branch 'main' into Vassiliy-Kudryashov/better_test_source_root_…
Vassiliy-Kudryashov Dec 2, 2022
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
Next Next commit
Better test source root suggestion: remove standard "src/main/" suffix
  • Loading branch information
@Vassiliy-Kudryashov
Vassiliy-Kudryashov committed Nov 29, 2022
commit 3ad6481b6c2895d574df7c6691ff172ac4f04f69
7 changes: 6 additions & 1 deletion ...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 @@ -8,6 +8,7 @@ import com.intellij.openapi.project.guessProjectDir
import com.intellij.openapi.ui.ComboBox
import com.intellij.openapi.ui.ComponentWithBrowseButton
import com.intellij.openapi.ui.FixedSizeButton
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.text.StringUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.newvfs.impl.FakeVirtualFile
Expand All @@ -26,10 +27,12 @@ import org.utbot.intellij.plugin.ui.utils.addDedicatedTestRoot
import org.utbot.intellij.plugin.ui.utils.dedicatedTestSourceRootName
import org.utbot.intellij.plugin.ui.utils.isBuildWithGradle

private const val SET_TEST_FOLDER = "set test folder"
private val SRC_MAIN = FileUtil.toSystemDependentName("src/main/")

class TestFolderComboWithBrowseButton(private val model: BaseTestsModel) :
ComponentWithBrowseButton<ComboBox<Any>>(ComboBox(), null) {

private val SET_TEST_FOLDER = "set test folder"

init {
if (model.project.isBuildWithGradle) {
Expand Down Expand Up @@ -95,6 +98,8 @@ class TestFolderComboWithBrowseButton(private val model: BaseTestsModel) :
StringUtil.commonPrefix(commonModuleSourceDirectory, sourceRoot.toNioPath().toString())
}
}
//Remove standard suffix that may prevent exact module path matching
commonModuleSourceDirectory = StringUtil.trimEnd(commonModuleSourceDirectory, SRC_MAIN)

return getAllTestSourceRoots().distinct().toMutableList().sortedWith(
compareByDescending<TestSourceRoot> {
Expand Down