Skip to content

Avoid remembering and restoring enum constants #1416

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 3 commits into from
Nov 25, 2022
Merged

Avoid remembering and restoring enum constants #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ba23f0
Avoid remembering and restoring enum constants
EgorkaKulikov Nov 23, 2022
38bf5fd
Add additional filtering
EgorkaKulikov Nov 25, 2022
5d190a8
Disable test again
EgorkaKulikov Nov 25, 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: 2 additions & 0 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,5 +1,6 @@
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 @@ -74,6 +75,7 @@ class ComplexEnumExamplesTest : UtValueTestCaseChecker(
}

@Test
@Disabled("TODO: nested anonymous classes are not supported: https://github.com/UnitTestBot/UTBotJava/issues/617")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that the reason for disabling here differs from issue mentioned in 617, so maybe create an another issue?

fun testFindState() {
check(
ComplexEnumExamples::findState,
Expand Down
7 changes: 6 additions & 1 deletion utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgMethodConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,7 +1361,12 @@ open class CgMethodConstructor(val context: CgContext) : CgContextOwner by conte
// TODO: remove this line when SAT-1273 is completed
execution.displayName = execution.displayName?.let { "${executableId.name}: $it" }
testMethod(testMethodName, execution.displayName) {
val statics = currentExecution!!.stateBefore.statics
//Enum constants are static, but there is no need to store and recover value for them
val statics = currentExecution!!.stateBefore
.statics
.filterNot { it.value is UtEnumConstantModel }
.filterNot { it.value.classId.outerClass?.isEnum == true }

rememberInitialStaticFields(statics)
val stateAnalyzer = ExecutionStateAnalyzer(execution)
val modificationInfo = stateAnalyzer.findModifiedFields()
Expand Down