Skip to content

Commit 608d56c

Browse files
volivan239AbdullinAM
authored andcommitted
Fix bug in filtering Kotlin getters/setters in plugin (UnitTestBot#1026)
1 parent 80da28b commit 608d56c

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package org.utbot.intellij.plugin.util
22

33
import com.intellij.psi.PsiClass
4+
import com.intellij.psi.PsiMember
45
import com.intellij.psi.PsiModifier
5-
import com.intellij.psi.PsiModifierListOwner
66
import com.intellij.psi.SyntheticElement
7-
import com.intellij.refactoring.classMembers.MemberInfoBase
87
import com.intellij.refactoring.util.classMembers.MemberInfo
98
import com.intellij.testIntegration.TestIntegrationUtils
109
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
@@ -13,21 +12,21 @@ import org.jetbrains.kotlin.asJava.elements.isSetter
1312
import org.utbot.common.filterWhen
1413
import org.utbot.framework.UtSettings
1514

16-
private val MemberInfoBase<out PsiModifierListOwner>.isAbstract: Boolean
17-
get() = this.member.modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false
15+
private val PsiMember.isAbstract: Boolean
16+
get() = modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false
1817

1918

20-
private val MemberInfo.isKotlinGetterOrSetter: Boolean
19+
private val PsiMember.isKotlinGetterOrSetter: Boolean
2120
get() {
2221
if (this !is KtLightMethod)
2322
return false
24-
return this.isGetter || this.isSetter
23+
return isGetter || isSetter
2524
}
2625

2726
private fun Iterable<MemberInfo>.filterTestableMethods(): List<MemberInfo> = this
2827
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { it.member !is SyntheticElement }
29-
.filterNot { it.isAbstract }
30-
.filterNot { it.isKotlinGetterOrSetter }
28+
.filterNot { it.member.isAbstract }
29+
.filterNot { it.member.isKotlinGetterOrSetter }
3130

3231
private val PsiClass.isPrivateOrProtected: Boolean
3332
get() = this.modifierList?.let {

0 commit comments

Comments
 (0)