Skip to content

Enum classes are instantiated correctly if some methods are overriden #1408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 23, 2022
Merged

Enum classes are instantiated correctly if some methods are overriden #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
398edf1
Enum classes are instantiated correctly if some methods are overriden
EgorkaKulikov Nov 22, 2022
2116ccf
Merge branch 'main' into egor/enum_constants_bug
EgorkaKulikov Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.utbot.examples.enums

import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
import org.utbot.examples.enums.ComplexEnumExamples.Color
import org.utbot.examples.enums.ComplexEnumExamples.Color.BLUE
Expand Down Expand Up @@ -75,7 +74,6 @@ class ComplexEnumExamplesTest : UtValueTestCaseChecker(
}

@Test
@Disabled("TODO: nested anonymous classes are not supported: https://github.com/UnitTestBot/UTBotJava/issues/617")
fun testFindState() {
check(
ComplexEnumExamples::findState,
Expand Down
10 changes: 7 additions & 3 deletions utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgStatementConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ import org.utbot.framework.plugin.api.util.fieldClassId
import org.utbot.framework.plugin.api.util.isPrimitive
import org.utbot.framework.plugin.api.util.methodClassId
import org.utbot.framework.plugin.api.util.denotableType
import org.utbot.framework.plugin.api.util.id
import org.utbot.framework.plugin.api.util.isEnum
import org.utbot.framework.plugin.api.util.supertypeOfAnonymousClass
import java.lang.reflect.Constructor
import java.lang.reflect.Method
Expand Down Expand Up @@ -500,11 +502,13 @@ internal class CgStatementConstructorImpl(context: CgContext) :
}

private fun guardEnumConstantAccess(access: CgEnumConstantAccess): ExpressionWithType {
val (enumClass, constant) = access
val (enumAccessClass, constant) = access

return if (enumClass.isAccessibleFrom(testClassPackageName)) {
ExpressionWithType(enumClass, access)
return if (enumAccessClass.isAccessibleFrom(testClassPackageName)) {
ExpressionWithType(enumAccessClass, access)
} else {
val enumClass: ClassId =
if (enumAccessClass.isEnum) enumAccessClass else enumAccessClass.outerClass!!.id
val enumClassVariable = newVar(classCgClassId) {
classClassId[forName](enumClass.name)
}
Expand Down
12 changes: 10 additions & 2 deletions utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgVariableConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import org.utbot.framework.plugin.api.util.findFieldByIdOrNull
import org.utbot.framework.plugin.api.util.id
import org.utbot.framework.plugin.api.util.intClassId
import org.utbot.framework.plugin.api.util.isArray
import org.utbot.framework.plugin.api.util.isEnum
import org.utbot.framework.plugin.api.util.isPrimitiveWrapperOrString
import org.utbot.framework.plugin.api.util.isStatic
import org.utbot.framework.plugin.api.util.stringClassId
Expand Down Expand Up @@ -445,8 +446,15 @@ open class CgVariableConstructor(val context: CgContext) :
}

private fun constructEnumConstant(model: UtEnumConstantModel, baseName: String?): CgVariable {
return newVar(model.classId, baseName) {
CgEnumConstantAccess(model.classId, model.value.name)
val classId = model.classId

require(classId.isEnum ||
classId.isAnonymous && classId.outerClass?.isEnum == true) {
"Enum constant model $model should be a enum or an anonymous class that overrides enum methods"
}

return newVar(classId, baseName) {
CgEnumConstantAccess(classId, model.value.name)
}
}

Expand Down