Skip to content

Commit 8618dff

Browse files
committed
Added MemberInfo.isAbstract ot MemberInfoUtils
1 parent f204c66 commit 8618dff

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import java.nio.file.Paths
5050
import java.util.concurrent.TimeUnit
5151
import org.utbot.common.filterWhen
5252
import org.utbot.engine.util.mockListeners.ForceStaticMockListener
53+
import org.utbot.intellij.plugin.util.isAbstract
5354
import kotlin.reflect.KClass
5455
import kotlin.reflect.full.functions
5556

@@ -141,7 +142,7 @@ object UtTestsDialogProcessor {
141142
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) {
142143
it.member !is SyntheticElement
143144
}
144-
.filterNot { it.member.modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false }
145+
.filterNot { it.isAbstract }
145146
findMethodsInClassMatchingSelected(clazz, srcMethods)
146147
}.executeSynchronously()
147148

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ import javax.swing.JList
128128
import javax.swing.JPanel
129129
import kotlin.streams.toList
130130
import org.utbot.common.filterWhen
131+
import org.utbot.intellij.plugin.util.isAbstract
131132

132133
private const val RECENTS_KEY = "org.utbot.recents"
133134

@@ -362,7 +363,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
362363
if (srcClasses.size == 1) {
363364
items = TestIntegrationUtils.extractClassMethods(srcClasses.single(), false)
364365
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { it.member !is SyntheticElement }
365-
.filterNot { it.member.modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false }
366+
.filterNot { it.isAbstract }
366367
updateMethodsTable(items)
367368
} else {
368369
items = srcClasses.map { MemberInfo(it) }
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.utbot.intellij.plugin.util
2+
3+
import com.intellij.psi.PsiModifier
4+
import com.intellij.psi.PsiModifierListOwner
5+
import com.intellij.refactoring.classMembers.MemberInfoBase
6+
7+
val MemberInfoBase<out PsiModifierListOwner>.isAbstract: Boolean
8+
get() = this.member.modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false

0 commit comments

Comments
 (0)