From 2a21465fc061ad2c714dcb030559f9cac5a79edd Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 12 Jul 2022 14:13:15 +0300 Subject: [PATCH] Improve overloadings check in generated code #370 --- .../src/main/kotlin/org/utbot/framework/plugin/api/Api.kt | 1 - .../codegen/model/constructor/util/ConstructorUtils.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt index 19f9af113f..701f69b242 100644 --- a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt +++ b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt @@ -706,7 +706,6 @@ open class ClassId( /** * Collects all declared methods (including private and protected) from class and all its superclasses to sequence */ - // TODO for now it duplicates overridden methods JIRA:1458 open val allMethods: Sequence get() = generateSequence(jClass) { it.superclass } .mapNotNull { it.declaredMethods } diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt index c6fa56305c..094988d99a 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt @@ -239,7 +239,7 @@ internal fun ClassId.getAmbiguousOverloadsOf(executableId: ExecutableId): Sequen } return allExecutables.filter { - it.name == executableId.name && it.parameters.size == executableId.executable.parameters.size + it.name == executableId.name && it.parameters.size == executableId.executable.parameters.size && it.classId == executableId.classId } }