Skip to content

Disable test generation for private nested classes in plugin #864 #865

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
Sep 21, 2022
Merged

Disable test generation for private nested classes in plugin #864 #865

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion 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 @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.idea.core.getPackage
import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
import org.jetbrains.kotlin.idea.core.util.toPsiFile
import org.utbot.intellij.plugin.util.extractFirstLevelMembers
import org.utbot.intellij.plugin.util.isVisible
import java.util.*
import org.jetbrains.kotlin.j2k.getContainingClass
import org.jetbrains.kotlin.utils.addIfNotNull
Expand Down Expand Up @@ -52,7 +53,7 @@ class GenerateTestsAction : AnAction(), UpdateInBackground {

if (psiElementHandler.isCreateTestActionAvailable(element)) {
val srcClass = psiElementHandler.containingClass(element) ?: return null
if (srcClass.isInterface) return null
if (srcClass.isInterface || !srcClass.isVisible) return null
val srcSourceRoot = srcClass.getSourceRoot() ?: return null
val srcMembers = srcClass.extractFirstLevelMembers(false)
val focusedMethod = focusedMethodOrNull(element, srcMembers, psiElementHandler)
Expand Down
27 changes: 22 additions & 5 deletions ...ellij/plugin/util/ExtractMembersHelper.kt → ...ot/intellij/plugin/util/PsiClassHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,24 @@ private fun Iterable<MemberInfo>.filterTestableMethods(): List<MemberInfo> = thi
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { it.member !is SyntheticElement }
.filterNot { it.isAbstract }

private val PsiClass.isPrivateOrProtected: Boolean
get() = this.modifierList?.let {
hasModifierProperty(PsiModifier.PRIVATE) || hasModifierProperty(PsiModifier.PROTECTED)
} ?: false


// TODO: maybe we need to delete [includeInherited] param here (always false when calling)?
fun PsiClass.extractClassMethodsIncludingNested(includeInherited: Boolean): List<MemberInfo> =
TestIntegrationUtils.extractClassMethods(this, includeInherited)
.filterTestableMethods() + innerClasses.flatMap { it.extractClassMethodsIncludingNested(includeInherited) }
fun PsiClass.extractClassMethodsIncludingNested(includeInherited: Boolean): List<MemberInfo> {
val ourMethods = TestIntegrationUtils.extractClassMethods(this, includeInherited)
.filterTestableMethods()

val methodsFromNestedClasses =
innerClasses
.filter { !it.isPrivateOrProtected }
.flatMap { it.extractClassMethodsIncludingNested(includeInherited) }

return ourMethods + methodsFromNestedClasses
}

fun PsiClass.extractFirstLevelMembers(includeInherited: Boolean): List<MemberInfo> {
val methods = TestIntegrationUtils.extractClassMethods(this, includeInherited)
Expand All @@ -29,5 +43,8 @@ fun PsiClass.extractFirstLevelMembers(includeInherited: Boolean): List<MemberInf
allInnerClasses
else
innerClasses
return methods + classes.map { MemberInfo(it) }
}
return methods + classes.filter { !it.isPrivateOrProtected }.map { MemberInfo(it) }
}

val PsiClass.isVisible: Boolean
get() = generateSequence(this) { it.containingClass }.none { it.isPrivateOrProtected }