Skip to content

Only one of generated tests is run with Generate and Run #1149 #1177

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
EgorkaKulikov merged 4 commits into from
Oct 19, 2022
Merged

Only one of generated tests is run with Generate and Run #1149 #1177

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcae703
Only one of generated tests is run with Generate and Run #1149
Vassiliy-Kudryashov Oct 18, 2022
e415814
Merge branch 'main' into Vassiliy-Kudryashov/1149-only-one-of-generat…
Vassiliy-Kudryashov Oct 18, 2022
9ee8642
Only one of generated tests is run with Generate and Run #1149
Vassiliy-Kudryashov Oct 19, 2022
b7f1dc9
Merge branch 'main' into Vassiliy-Kudryashov/1149-only-one-of-generat…
Vassiliy-Kudryashov Oct 19, 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
Prev Previous commit
Next Next commit
Only one of generated tests is run with Generate and Run #1149 
Refactoring and comments
  • Loading branch information
@Vassiliy-Kudryashov
Vassiliy-Kudryashov committed Oct 19, 2022
commit 9ee864223572330f5c213e338fd37ecc1f2fe41e
28 changes: 16 additions & 12 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/RunConfigurationHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,20 @@ class RunConfigurationHelper {
companion object {
private val logger = KotlinLogging.logger {}

private fun RunConfiguration.isPatternBased() = this is JavaTestConfigurationBase && testType == "pattern"

// In case we do "generate and run" for many files at once,
// desired run configuration has to be one of "pattern" typed test configuration that may run many tests at once.
// Thus, we sort list of all provided configurations to get desired configuration the first.
private val rcComparator = Comparator<ConfigurationFromContext> { o1, o2 ->
val p1 = o1.configuration.isPatternBased()
val p2 = o2.configuration.isPatternBased()
if (p1 xor p2) {
return@Comparator if (p1) -1 else 1
}
ConfigurationFromContext.COMPARATOR.compare(o1, o2)
}

fun runTestsWithCoverage(
model: GenerateTestsModel,
testFilesPointers: MutableList<SmartPsiElementPointer<PsiFile>>,
Expand Down Expand Up @@ -91,17 +105,9 @@ class RunConfigurationHelper {
)
run(IntelliJApiHelper.Target.THREAD_POOL) {
val configurations = ApplicationManager.getApplication().runReadAction(Computable {
val list = RunConfigurationProducer.getProducers(model.project)
return@Computable RunConfigurationProducer.getProducers(model.project)
.mapNotNull { it.findOrCreateConfigurationFromContext(myConfigurationContext) }
.toMutableList().sortedWith(Comparator<ConfigurationFromContext> { o1, o2 ->
val p1 = o1.configuration.isPatternBased()
val p2 = o2.configuration.isPatternBased()
if (p1 xor p2) {
return@Comparator if (p1) -1 else 1
}
ConfigurationFromContext.COMPARATOR.compare(o1, o2)
})
return@Computable list
.toMutableList().sortedWith(rcComparator)
})

val settings = if (configurations.isEmpty()) null else configurations[0].configurationSettings
Expand All @@ -128,7 +134,5 @@ class RunConfigurationHelper {
}
}
}

private fun RunConfiguration.isPatternBased() = this is JavaTestConfigurationBase && testType == "pattern"
}
}