Rewrote filters for synthetic elements with filterWhen

Author: Ivan Volkov

utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt

@@ -21,6 +21,7 @@ import java.nio.file.Paths
 import java.time.temporal.ChronoUnit
 import kotlin.reflect.KClass
 import mu.KotlinLogging
+import org.utbot.common.filterWhen
 import org.utbot.framework.UtSettings
 import org.utbot.framework.util.isSynthetic
 
@@ -93,9 +94,8 @@ class GenerateTestsCommand :
             logger.debug { "Classpath to be used: ${newline()} $classPath ${newline()}" }
 
             val classUnderTest: KClass<*> = loadClassBySpecifiedFqn(targetClassFqn)
-            val targetMethods = classUnderTest.targetMethods().filter {
-                UtSettings.generateForSyntheticMethods || isSynthetic(it)
-            }
+            val targetMethods = classUnderTest.targetMethods()
+                .filterWhen(!UtSettings.generateForSyntheticMethods) { !isSynthetic(it) }
             initializeEngine(workingDirectory)
 
             if (targetMethods.isEmpty()) {

utbot-core/src/main/kotlin/org/utbot/common/FilterWhen.kt

@@ -0,0 +1,15 @@
+package org.utbot.common
+
+// TODO: add docs
+inline fun <T> Iterable<T>.filterWhen(condition: Boolean, predicate: (T) -> Boolean): List<T> =
+    if (condition)
+        this.filter(predicate)
+    else
+        this.toList()
+
+// TODO: add docs
+fun <T> Sequence<T>.filterWhen(condition: Boolean, predicate: (T) -> Boolean): Sequence<T> =
+    if (condition)
+        this.filter(predicate)
+    else
+        this

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

@@ -118,6 +118,7 @@ import javax.swing.JList
 import javax.swing.JPanel
 import kotlin.streams.toList
 import org.jetbrains.concurrency.thenRun
+import org.utbot.common.filterWhen
 import org.utbot.intellij.plugin.ui.utils.allLibraries
 
 private const val RECENTS_KEY = "org.utbot.recents"
@@ -347,7 +348,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
         val items: List<MemberInfo>
         if (srcClasses.size == 1) {
             items = TestIntegrationUtils.extractClassMethods(srcClasses.single(), false)
-                .filter { UtSettings.generateForSyntheticMethods || it.member !is SyntheticElement }
+                .filterWhen(!UtSettings.generateForSyntheticMethods) { it.member !is SyntheticElement }
             updateMethodsTable(items)
         } else {
             items = srcClasses.map { MemberInfo(it) }

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

@@ -41,6 +41,7 @@ import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
 import mu.KotlinLogging
 import org.jetbrains.kotlin.idea.util.module
+import org.utbot.common.filterWhen
 import org.utbot.engine.util.mockListeners.ForceMockListener
 import org.utbot.engine.util.mockListeners.ForceStaticMockListener
 import org.utbot.intellij.plugin.error.showErrorDialogLater
@@ -129,9 +130,10 @@ object UtTestsDialogProcessor {
                                 val methods = ReadAction.nonBlocking<List<UtMethod<*>>> {
                                     val clazz = classLoader.loadClass(srcClass.qualifiedName).kotlin
                                     val srcMethods = model.selectedMethods?.toList() ?:
-                                        TestIntegrationUtils.extractClassMethods(srcClass, false).filter {
-                                            UtSettings.generateForSyntheticMethods || it.member !is SyntheticElement
-                                        }
+                                        TestIntegrationUtils.extractClassMethods(srcClass, false)
+                                            .filterWhen(!UtSettings.generateForSyntheticMethods) {
+                                                it.member !is SyntheticElement
+                                            }
                                     findMethodsInClassMatchingSelected(clazz, srcMethods)
                                 }.executeSynchronously()
 

utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt

@@ -66,6 +66,7 @@ import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.coroutines.yield
 import mu.KotlinLogging
 import org.apache.commons.io.FileUtils
+import org.utbot.common.filterWhen
 import org.utbot.framework.util.isSynthetic
 
 internal const val junitVersion = 4
@@ -472,9 +473,7 @@ private fun prepareClass(kotlinClass: KClass<*>, methodNameFilter: String?): Lis
         .filter { methodNameFilter?.equals(it.callable.name) ?: true }
         .filterNot {
             it.isConstructor && (it.clazz.isAbstract || it.clazz.java.isEnum)
-        }.filter {
-            UtSettings.generateForSyntheticMethods || !isSynthetic(it)
-        }
+        }.filterWhen(!UtSettings.generateForSyntheticMethods) { !isSynthetic(it) }
         .toList()
 
     return if (kotlinClass.nestedClasses.isEmpty()) {