Skip to content

Commit efea2e1

Browse files
author
Ivan Volkov
committed
Stylistic changes for #505
1 parent 2473eec commit efea2e1

File tree

9 files changed

+29
-24
lines changed

9 files changed

+29
-24
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import kotlin.reflect.KClass
2323
import mu.KotlinLogging
2424
import org.utbot.common.filterWhen
2525
import org.utbot.framework.UtSettings
26-
import org.utbot.framework.util.isSynthetic
26+
import org.utbot.framework.util.isSyntheticMethod
2727

2828

2929
private val logger = KotlinLogging.logger {}
@@ -95,7 +95,7 @@ class GenerateTestsCommand :
9595

9696
val classUnderTest: KClass<*> = loadClassBySpecifiedFqn(targetClassFqn)
9797
val targetMethods = classUnderTest.targetMethods()
98-
.filterWhen(!UtSettings.generateForSyntheticMethods) { !isSynthetic(it) }
98+
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { !isSyntheticMethod(it) }
9999
initializeEngine(workingDirectory)
100100

101101
if (targetMethods.isEmpty()) {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.utbot.common
22

33
/**
4-
* If [condition] is true, returns list containing only elements, matching [predicate].
4+
* If [condition] is true, returns a list containing only elements matching [predicate].
55
* Otherwise, returns list with all elements of collection
66
*/
77
inline fun <T> Iterable<T>.filterWhen(condition: Boolean, predicate: (T) -> Boolean): List<T> =
@@ -11,7 +11,7 @@ inline fun <T> Iterable<T>.filterWhen(condition: Boolean, predicate: (T) -> Bool
1111
this.toList()
1212

1313
/**
14-
* If [condition] is true, returns sequence containing only elements, matching [predicate].
14+
* If [condition] is true, returns a sequence containing only elements matching [predicate].
1515
* Otherwise, leaves sequence unchanged
1616
*/
1717
fun <T> Sequence<T>.filterWhen(condition: Boolean, predicate: (T) -> Boolean): Sequence<T> =

utbot-framework-api/src/main/kotlin/org/utbot/framework/SyntheticMethods.kt

-5
This file was deleted.

utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ object UtSettings {
378378
/**
379379
* Flag that indicates whether tests for synthetic methods (values, valueOf in enums) should be generated, or not
380380
*/
381-
var generateForSyntheticMethods by getBooleanProperty(false)
381+
var skipTestGenerationForSyntheticMethods by getBooleanProperty(true)
382382

383383
override fun toString(): String =
384384
properties

utbot-framework/src/main/kotlin/org/utbot/framework/util/SyntethicMethodsChecker.kt

-8
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package org.utbot.framework.util
2+
3+
import org.utbot.engine.displayName
4+
import org.utbot.framework.plugin.api.UtMethod
5+
6+
fun isSyntheticMethod(method: UtMethod<*>): Boolean =
7+
if (method.clazz.java.isEnum)
8+
method.displayName.substringBefore('(') in KnownSyntheticMethodNames.enumSyntheticMethodNames
9+
else
10+
false
11+
12+
/**
13+
* Contains names of methods that are always autogenerated and thus it is unlikely that
14+
* one would want to generate tests for them.
15+
*/
16+
private object KnownSyntheticMethodNames {
17+
/** List with names of enum methods that are autogenerated */
18+
val enumSyntheticMethodNames = listOf("values", "valueOf")
19+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
348348
val items: List<MemberInfo>
349349
if (srcClasses.size == 1) {
350350
items = TestIntegrationUtils.extractClassMethods(srcClasses.single(), false)
351-
.filterWhen(!UtSettings.generateForSyntheticMethods) { it.member !is SyntheticElement }
351+
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { it.member !is SyntheticElement }
352352
updateMethodsTable(items)
353353
} else {
354354
items = srcClasses.map { MemberInfo(it) }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ object UtTestsDialogProcessor {
131131
val clazz = classLoader.loadClass(srcClass.qualifiedName).kotlin
132132
val srcMethods = model.selectedMethods?.toList() ?:
133133
TestIntegrationUtils.extractClassMethods(srcClass, false)
134-
.filterWhen(!UtSettings.generateForSyntheticMethods) {
134+
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) {
135135
it.member !is SyntheticElement
136136
}
137137
findMethodsInClassMatchingSelected(clazz, srcMethods)

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import kotlinx.coroutines.yield
6767
import mu.KotlinLogging
6868
import org.apache.commons.io.FileUtils
6969
import org.utbot.common.filterWhen
70-
import org.utbot.framework.util.isSynthetic
70+
import org.utbot.framework.util.isSyntheticMethod
7171

7272
internal const val junitVersion = 4
7373
private val logger = KotlinLogging.logger {}
@@ -471,9 +471,8 @@ private fun prepareClass(kotlinClass: KClass<*>, methodNameFilter: String?): Lis
471471
val classFilteredMethods = methodsToGenerate.asSequence()
472472
.map { UtMethod(it.first, kotlinClass) }
473473
.filter { methodNameFilter?.equals(it.callable.name) ?: true }
474-
.filterNot {
475-
it.isConstructor && (it.clazz.isAbstract || it.clazz.java.isEnum)
476-
}.filterWhen(!UtSettings.generateForSyntheticMethods) { !isSynthetic(it) }
474+
.filterNot { it.isConstructor && (it.clazz.isAbstract || it.clazz.java.isEnum) }
475+
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { !isSyntheticMethod(it) }
477476
.toList()
478477

479478
return if (kotlinClass.nestedClasses.isEmpty()) {

0 commit comments

Comments
 (0)