Skip to content

Wrappers for concurrency classes #1535

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
Damtev merged 12 commits into from
Jan 3, 2023
Merged

Wrappers for concurrency classes #1535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6dfb131
Added wrappers for Thread and ThreadGroup
Damtev Nov 21, 2022
bbd6d39
Added a wrapper for CompletableFuture
Damtev Nov 23, 2022
69fac2e
Added preconditionCheck for wrappers for Thread and ThreadGroup
Damtev Nov 23, 2022
a2c6751
Added a wrapper for ExecutorService
Damtev Nov 23, 2022
190656c
Fixed wrappers for Thread and ExecutorService
Damtev Nov 23, 2022
f99b521
Added a wrapper for CountDownLatch
Damtev Nov 24, 2022
afac549
Fixed hierarchy incompability with UtThread and added missed fields
Damtev Nov 26, 2022
d48e113
Added tests for other wrappers
Damtev Dec 16, 2022
dd38cb5
Added missing quotes
Damtev Dec 23, 2022
fe0c3e6
Fixed a substitution static fields with unbounded variables
Damtev Dec 28, 2022
e5ac4c4
Added CompletableFuture.supplyAsync mock implementation
Damtev Dec 29, 2022
ab27cab
Fixed review issues
Damtev Jan 3, 2023
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
Prev Previous commit
Next Next commit
Fixed a substitution static fields with unbounded variables
  • Loading branch information
@Damtev
Damtev committed Jan 3, 2023
commit fe0c3e6b4bb37824cb2a242ebddccc6b450f69a4
4 changes: 3 additions & 1 deletion utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.utbot.examples.annotations
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
import org.utbot.testcheckers.eq
import org.utbot.testing.AtLeast
import org.utbot.testing.UtValueTestCaseChecker

internal class NotNullAnnotationTest : UtValueTestCaseChecker(testClass = NotNullAnnotation::class) {
Expand Down Expand Up @@ -68,7 +69,8 @@ internal class NotNullAnnotationTest : UtValueTestCaseChecker(testClass = NotNul
checkStatics(
NotNullAnnotation::notNullStaticField,
eq(1),
{ statics, result -> result == statics.values.single().value }
{ statics, result -> result == statics.values.single().value },
coverage = AtLeast(66)
)
}

Expand Down
11 changes: 9 additions & 2 deletions utbot-framework/src/main/kotlin/org/utbot/engine/Memory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ data class Memory( // TODO: split purely symbolic memory and information about s
.mapValues { (_, values) -> values.first().value to values.last().value }

val previousMemoryStates = staticFieldsStates.toMutableMap()
val previousFieldValues = fieldValues.toMutableMap()


/**
Expand All @@ -212,6 +213,11 @@ data class Memory( // TODO: split purely symbolic memory and information about s
update.classIdToClearStatics?.let { classId ->
Scene.v().getSootClass(classId.name).fields.forEach { sootField ->
previousMemoryStates.remove(sootField.fieldId)

if (sootField.isStatic) {
// Only statics should be cleared here
previousFieldValues.remove(sootField)
Comment thread
Damtev marked this conversation as resolved.
}
}
}

Expand Down Expand Up @@ -254,7 +260,7 @@ data class Memory( // TODO: split purely symbolic memory and information about s
initializedStaticFields = initializedStaticFields.addAll(update.initializedStaticFields),
staticFieldsStates = previousMemoryStates.toPersistentMap().putAll(updatedStaticFields),
meaningfulStaticFields = meaningfulStaticFields.addAll(update.meaningfulStaticFields),
fieldValues = fieldValues.putAll(update.fieldValues),
fieldValues = previousFieldValues.toPersistentMap().putAll(update.fieldValues),
addrToArrayType = addrToArrayType.putAll(update.addrToArrayType),
addrToMockInfo = addrToMockInfo.putAll(update.addrToMockInfo),
updates = updates + update,
Expand All @@ -278,7 +284,8 @@ data class Memory( // TODO: split purely symbolic memory and information about s
*/
fun queuedStaticMemoryUpdates(): MemoryUpdate = MemoryUpdate(
staticInstanceStorage = updates.staticInstanceStorage,
staticFieldsUpdates = updates.staticFieldsUpdates
staticFieldsUpdates = updates.staticFieldsUpdates,
fieldValues = updates.fieldValues.filter { it.key.isStatic }.toPersistentMap()
)

/**
Expand Down
5 changes: 4 additions & 1 deletion utbot-framework/src/main/kotlin/org/utbot/engine/Traverser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import kotlinx.collections.immutable.persistentHashSetOf
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.persistentSetOf
import kotlinx.collections.immutable.toPersistentList
import kotlinx.collections.immutable.toPersistentMap
import kotlinx.collections.immutable.toPersistentSet
import org.utbot.common.WorkaroundReason.HACK
import org.utbot.framework.UtSettings.ignoreStaticsFromTrustedLibraries
Expand Down Expand Up @@ -1936,7 +1937,6 @@ class Traverser(
val touchedStaticFields = persistentListOf(staticFieldMemoryUpdate)
queuedSymbolicStateUpdates += MemoryUpdate(staticFieldsUpdates = touchedStaticFields)

// TODO filter enum constant static fields JIRA:1681
if (!environment.method.isStaticInitializer && isStaticFieldMeaningful(field)) {
queuedSymbolicStateUpdates += MemoryUpdate(meaningfulStaticFields = persistentSetOf(fieldId))
}
Expand Down Expand Up @@ -3579,6 +3579,7 @@ class Traverser(
val declaringClassId = declaringClass.id

val staticFieldsUpdates = updates.staticFieldsUpdates.toMutableList()
val fieldValuesUpdates = updates.fieldValues.toMutableMap()
val updatedFields = staticFieldsUpdates.mapTo(mutableSetOf()) { it.fieldId }
val objectUpdates = mutableListOf<UtNamedStore>()

Expand All @@ -3591,6 +3592,7 @@ class Traverser(
// remove updates from clinit, because we'll replace those values
// with new unbounded symbolic variable
staticFieldsUpdates.removeAll { update -> update.fieldId == it.fieldId }
fieldValuesUpdates.keys.removeAll { key -> key.fieldId == it.fieldId }

val value = createConst(it.type, it.name)
val valueToStore = if (value is ReferenceValue) {
Expand All @@ -3610,6 +3612,7 @@ class Traverser(
return updates.copy(
stores = updates.stores.addAll(objectUpdates),
staticFieldsUpdates = staticFieldsUpdates.toPersistentList(),
fieldValues = fieldValuesUpdates.toPersistentMap(),
classIdToClearStatics = declaringClassId
)
}
Expand Down