Skip to content

Commit 7c67a69

Browse files
Rebase on master
1 parent e187f67 commit 7c67a69

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,18 +406,18 @@ val Constructor<*>.executableId: ConstructorId
406406
return constructorId(classId, *arguments)
407407
}
408408

409-
val ExecutableId.displayName: String
409+
val ExecutableId.humanReadableName: String
410410
get() {
411411
val executableName = this.name
412412
val parameters = this.parameters.joinToString(separator = ", ") { it.canonicalName }
413413
return "$executableName($parameters)"
414414
}
415415

416416
val Constructor<*>.displayName: String
417-
get() = executableId.displayName
417+
get() = executableId.humanReadableName
418418

419419
val Method.displayName: String
420-
get() = executableId.displayName
420+
get() = executableId.humanReadableName
421421

422422
val KCallable<*>.declaringClazz: Class<*>
423423
get() = when (this) {

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.utbot.framework.plugin.api.MethodId
3030
import org.utbot.framework.plugin.api.UtMethodTestSet
3131
import org.utbot.framework.codegen.model.constructor.TestClassModel
3232
import org.utbot.framework.plugin.api.util.description
33-
import org.utbot.framework.plugin.api.util.displayName
33+
import org.utbot.framework.plugin.api.util.humanReadableName
3434
import org.utbot.framework.plugin.api.util.kClass
3535
import kotlin.reflect.KClass
3636

@@ -194,7 +194,7 @@ internal class CgTestClassConstructor(val context: CgContext) :
194194
)
195195

196196
regions += CgSimpleRegion(
197-
"Parameterized test for method ${methodUnderTest.displayName}",
197+
"Parameterized test for method ${methodUnderTest.humanReadableName}",
198198
listOf(parameterizedTestMethod),
199199
)
200200
}.onFailure { error -> processFailure(testSet, error) }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.utbot.framework.util
22

33
import org.utbot.framework.plugin.api.ExecutableId
4-
import org.utbot.framework.plugin.api.util.displayName
4+
import org.utbot.framework.plugin.api.util.humanReadableName
55
import org.utbot.framework.plugin.api.util.isEnum
66

77
fun isKnownSyntheticMethod(method: ExecutableId): Boolean =
88
if (method.classId.isEnum)
9-
method.displayName.substringBefore('(') in KnownSyntheticMethodNames.enumSyntheticMethodNames
9+
method.humanReadableName.substringBefore('(') in KnownSyntheticMethodNames.enumSyntheticMethodNames
1010
else
1111
false
1212

utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ import java.io.File
2323
import java.nio.file.Path
2424
import java.nio.file.Paths
2525
import mu.KotlinLogging
26+
import org.utbot.framework.plugin.api.UtConcreteExecutionFailure
27+
import org.utbot.framework.plugin.api.UtExecutionSuccess
28+
import org.utbot.framework.plugin.api.UtExplicitlyThrownException
29+
import org.utbot.framework.plugin.api.UtImplicitlyThrownException
30+
import org.utbot.framework.plugin.api.UtOverflowFailure
31+
import org.utbot.framework.plugin.api.UtSandboxFailure
32+
import org.utbot.framework.plugin.api.UtTimeoutException
33+
import org.utbot.framework.plugin.api.util.humanReadableName
2634
import org.utbot.framework.plugin.api.util.jClass
2735
import org.utbot.fuzzer.FuzzedMethodDescription
2836
import org.utbot.fuzzer.FuzzedValue

utbot-summary/src/main/kotlin/org/utbot/summary/TagGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.utbot.framework.plugin.api.UtOverflowFailure
1111
import org.utbot.framework.plugin.api.UtMethodTestSet
1212
import org.utbot.framework.plugin.api.UtSandboxFailure
1313
import org.utbot.framework.plugin.api.UtTimeoutException
14-
import org.utbot.framework.plugin.api.util.displayName
14+
import org.utbot.framework.plugin.api.util.humanReadableName
1515
import org.utbot.framework.plugin.api.util.isCheckedException
1616
import org.utbot.summary.UtSummarySettings.MIN_NUMBER_OF_EXECUTIONS_FOR_CLUSTERING
1717
import org.utbot.summary.clustering.MatrixUniqueness

0 commit comments

Comments
 (0)