Skip to content
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

UI action is disabled for several selected classes or packages #882 #896

Merged
merged 2 commits into from
Sep 12, 2022
Merged

UI action is disabled for several selected classes or packages #882 #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19b8801
UI action is disabled for several selected classes or packages #882
Vassiliy-Kudryashov Sep 9, 2022
ec404eb
UI action is disabled for several selected classes or packages #882
Vassiliy-Kudryashov Sep 12, 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
12 changes: 6 additions & 6 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ object UtTestsDialogProcessor {
project: Project,
srcClasses: Set<PsiClass>,
extractMembersFromSrcClasses: Boolean,
focusedMethod: MemberInfo?,
focusedMethods: Set<MemberInfo>,
) {
createDialog(project, srcClasses, extractMembersFromSrcClasses, focusedMethod)?.let {
createDialog(project, srcClasses, extractMembersFromSrcClasses, focusedMethods)?.let {
if (it.showAndGet()) createTests(project, it.model)
}
}
Expand All @@ -83,7 +83,7 @@ object UtTestsDialogProcessor {
project: Project,
srcClasses: Set<PsiClass>,
extractMembersFromSrcClasses: Boolean,
focusedMethod: MemberInfo?,
focusedMethods: Set<MemberInfo>,
): GenerateTestsDialogWindow? {
val srcModule = findSrcModule(srcClasses)
val testModules = srcModule.testModules(project)
Expand All @@ -108,7 +108,7 @@ object UtTestsDialogProcessor {
testModules,
srcClasses,
extractMembersFromSrcClasses,
if (focusedMethod != null) setOf(focusedMethod) else null,
focusedMethods,
UtSettings.utBotGenerationTimeoutInMillis,
)
)
Expand Down Expand Up @@ -168,8 +168,8 @@ object UtTestsDialogProcessor {
psi2KClass[srcClass] = clazz

val srcMethods = if (model.extractMembersFromSrcClasses) {
val chosenMethods = model.selectedMembers?.filter { it.member is PsiMethod } ?: listOf()
val chosenNestedClasses = model.selectedMembers?.mapNotNull { it.member as? PsiClass } ?: listOf()
val chosenMethods = model.selectedMembers.filter { it.member is PsiMethod }
val chosenNestedClasses = model.selectedMembers.mapNotNull { it.member as? PsiClass }
chosenMethods + chosenNestedClasses.flatMap {
it.extractClassMethodsIncludingNested(false)
}
Expand Down
2 changes: 1 addition & 1 deletion utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/GenerateTestsModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ data class GenerateTestsModel(
val potentialTestModules: List<Module>,
var srcClasses: Set<PsiClass>,
val extractMembersFromSrcClasses: Boolean,
var selectedMembers: Set<MemberInfo>?, // TODO: maybe we should make it not nullable?
var selectedMembers: Set<MemberInfo>,
var timeout: Long,
var generateWarningsForStaticMocking: Boolean = false,
var fuzzingValue: Double = 0.05
Expand Down
2 changes: 1 addition & 1 deletion utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
}

private fun checkMembers(allMembers: List<MemberInfo>) {
val selectedDisplayNames = model.selectedMembers?.map { it.displayName } ?: emptyList()
val selectedDisplayNames = model.selectedMembers.map { it.displayName }
val selectedMembers = allMembers.filter { it.displayName in selectedDisplayNames }

val methodsToCheck = selectedMembers.ifEmpty { allMembers }
Expand Down
39 changes: 30 additions & 9 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/actions/GenerateTestsAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import org.utbot.intellij.plugin.ui.utils.PsiElementHandler
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.actionSystem.PlatformDataKeys
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.module.ModuleUtil
import com.intellij.openapi.project.Project
Expand All @@ -19,19 +20,21 @@ import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
import org.jetbrains.kotlin.idea.core.util.toPsiFile
import org.utbot.intellij.plugin.util.extractFirstLevelMembers
import java.util.*
import org.jetbrains.kotlin.j2k.getContainingClass
import org.jetbrains.kotlin.utils.addIfNotNull

class GenerateTestsAction : AnAction() {
override fun actionPerformed(e: AnActionEvent) {
val project = e.project ?: return
val (srcClasses, focusedMethod, extractMembersFromSrcClasses) = getPsiTargets(e) ?: return
UtTestsDialogProcessor.createDialogAndGenerateTests(project, srcClasses, extractMembersFromSrcClasses, focusedMethod)
val (srcClasses, focusedMethods, extractMembersFromSrcClasses) = getPsiTargets(e) ?: return
UtTestsDialogProcessor.createDialogAndGenerateTests(project, srcClasses, extractMembersFromSrcClasses, focusedMethods)
}

override fun update(e: AnActionEvent) {
e.presentation.isEnabled = getPsiTargets(e) != null
}

private fun getPsiTargets(e: AnActionEvent): Triple<Set<PsiClass>, MemberInfo?, Boolean>? {
private fun getPsiTargets(e: AnActionEvent): Triple<Set<PsiClass>, Set<MemberInfo>, Boolean>? {
val project = e.project ?: return null
val editor = e.getData(CommonDataKeys.EDITOR)
if (editor != null) {
Expand All @@ -56,19 +59,19 @@ class GenerateTestsAction : AnAction() {
return null
}

return Triple(setOf(srcClass), focusedMethod, true)
return Triple(setOf(srcClass), if (focusedMethod != null) setOf(focusedMethod) else emptySet(), true)
}
} else {
// The action is being called from 'Project' tool window
val srcClasses = mutableSetOf<PsiClass>()
var selectedMethod: MemberInfo? = null
val selectedMethods = mutableSetOf<MemberInfo>()
var extractMembersFromSrcClasses = false
val element = e.getData(CommonDataKeys.PSI_ELEMENT) ?: return null
val element = e.getData(CommonDataKeys.PSI_ELEMENT)
if (element is PsiFileSystemItem) {
e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY)?.let {
srcClasses += getAllClasses(project, it)
}
} else {
} else if (element is PsiElement){
val file = element.containingFile ?: return null
val psiElementHandler = PsiElementHandler.makePsiElementHandler(file)

Expand All @@ -81,11 +84,29 @@ class GenerateTestsAction : AnAction() {
}

if (element is PsiMethod) {
selectedMethod = MemberInfo(element)
selectedMethods.add(MemberInfo(element))
}
}
} else {
val someSelection = e.getData(PlatformDataKeys.SELECTED_ITEMS)?: return null
someSelection.forEach {
when(it) {
is PsiFileSystemItem -> srcClasses += getAllClasses(project, arrayOf(it.virtualFile))
is PsiClass -> srcClasses.add(it)
is PsiElement -> {
srcClasses.addIfNotNull(it.getContainingClass())
if (it is PsiMethod) {
selectedMethods.add(MemberInfo(it))
extractMembersFromSrcClasses = true
}
}
}
}
}
srcClasses.removeIf { it.isInterface }
if (srcClasses.size > 1) {
extractMembersFromSrcClasses = false
}
var commonSourceRoot = null as VirtualFile?
for (srcClass in srcClasses) {
if (commonSourceRoot == null) {
Expand All @@ -100,7 +121,7 @@ class GenerateTestsAction : AnAction() {
.filter { folder -> !folder.rootType.isForTests && folder.file == commonSourceRoot}
.findAny().isPresent ) return null

return Triple(srcClasses.toSet(), selectedMethod, extractMembersFromSrcClasses)
return Triple(srcClasses.toSet(), selectedMethods.toSet(), extractMembersFromSrcClasses)
}
return null
}
Expand Down