Skip to content

Commit ac8e68a

Browse files
committed
Some style improvements to job cancellation
1 parent 69309fd commit ac8e68a

File tree

5 files changed

+22
-14
lines changed

5 files changed

+22
-14
lines changed

utbot-framework/src/main/kotlin/org/utbot/engine/util/mockListeners/ForceMockListener.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ import org.utbot.framework.util.ConflictTriggers
1212
*
1313
* Supposed to be created only if Mockito is not installed.
1414
*/
15-
class ForceMockListener private constructor(triggers: ConflictTriggers, private val cancelJob: Boolean): MockListener(triggers) {
15+
class ForceMockListener private constructor(triggers: ConflictTriggers, private val shouldCancelJob: Boolean): MockListener(triggers) {
1616
override fun onShouldMock(controller: EngineController, strategy: MockStrategy, mockInfo: UtMockInfo) {
1717
// If force mocking happened -- сancel engine job
18-
if (cancelJob) controller.job?.cancel(ForceMockCancellationException())
18+
if (shouldCancelJob) controller.job?.cancel(ForceMockCancellationException())
1919

2020
triggers[Conflict.ForceMockHappened] = true
2121
}
2222

2323
companion object {
24-
fun create(testCaseGenerator: TestCaseGenerator, conflictTriggers: ConflictTriggers, cancelJob: Boolean = true) : ForceMockListener {
25-
val listener = ForceMockListener(conflictTriggers, cancelJob)
24+
fun create(
25+
testCaseGenerator: TestCaseGenerator,
26+
conflictTriggers: ConflictTriggers,
27+
shouldCancelJob: Boolean = false,
28+
) : ForceMockListener {
29+
val listener = ForceMockListener(conflictTriggers, shouldCancelJob)
2630
testCaseGenerator.engineActions.add { engine -> engine.attachMockListener(listener) }
2731

2832
return listener

utbot-framework/src/main/kotlin/org/utbot/engine/util/mockListeners/ForceStaticMockListener.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,25 @@ import org.utbot.framework.util.ConflictTriggers
1616
*
1717
* Supposed to be created only if Mockito inline is not installed.
1818
*/
19-
class ForceStaticMockListener private constructor(triggers: ConflictTriggers, private val cancelJob: Boolean): MockListener(triggers) {
19+
class ForceStaticMockListener private constructor(triggers: ConflictTriggers, private val shouldCancelJob: Boolean): MockListener(triggers) {
2020
override fun onShouldMock(controller: EngineController, strategy: MockStrategy, mockInfo: UtMockInfo) {
2121
if (mockInfo is UtNewInstanceMockInfo
2222
|| mockInfo is UtStaticMethodMockInfo
2323
|| mockInfo is UtStaticObjectMockInfo) {
2424
// If force static mocking happened -- сancel engine job
25-
if (cancelJob) controller.job?.cancel(ForceStaticMockCancellationException())
25+
if (shouldCancelJob) controller.job?.cancel(ForceStaticMockCancellationException())
2626

2727
triggers[Conflict.ForceStaticMockHappened] = true
2828
}
2929
}
3030

3131
companion object {
32-
fun create(testCaseGenerator: TestCaseGenerator, conflictTriggers: ConflictTriggers, cancelJob: Boolean = true) : ForceStaticMockListener {
33-
val listener = ForceStaticMockListener(conflictTriggers, cancelJob)
32+
fun create(
33+
testCaseGenerator: TestCaseGenerator,
34+
conflictTriggers: ConflictTriggers,
35+
shouldCancelJob: Boolean = false,
36+
) : ForceStaticMockListener {
37+
val listener = ForceStaticMockListener(conflictTriggers, shouldCancelJob)
3438
testCaseGenerator.engineActions.add { engine -> engine.attachMockListener(listener) }
3539

3640
return listener

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ open class TestCaseGenerator(
149149
val method2errors = methods.associateWith { mutableMapOf<String, Int>() }
150150

151151
val conflictTriggers = ConflictTriggers()
152-
val forceMockListener = ForceMockListener.create(this, conflictTriggers, cancelJob = false)
153-
val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers, cancelJob = false)
152+
val forceMockListener = ForceMockListener.create(this, conflictTriggers)
153+
val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers)
154154

155155
runIgnoringCancellationException {
156156
runBlockingWithCancellationPredicate(isCanceled) {

utbot-framework/src/main/kotlin/org/utbot/framework/process/EngineProcessMain.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ private fun EngineProcessModel.setup(kryoHelper: KryoHelper, watchdog: IdleWatch
102102
val mockFrameworkInstalled = params.mockInstalled
103103
val conflictTriggers = ConflictTriggers(kryoHelper.readObject(params.conflictTriggers))
104104
if (!mockFrameworkInstalled) {
105-
ForceMockListener.create(testGenerator, conflictTriggers, cancelJob = true)
105+
ForceMockListener.create(testGenerator, conflictTriggers, shouldCancelJob = true)
106106
}
107107
val staticsMockingConfigured = params.staticsMockingIsConfigureda
108108
if (!staticsMockingConfigured) {
109-
ForceStaticMockListener.create(testGenerator, conflictTriggers, cancelJob = true)
109+
ForceStaticMockListener.create(testGenerator, conflictTriggers, shouldCancelJob = true)
110110
}
111111

112112
val generateFlow = when (testGenerator.applicationContext) {

utbot-testing/src/main/kotlin/org/utbot/testing/TestSpecificTestCaseGenerator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class TestSpecificTestCaseGenerator(
5757
val mockAlwaysDefaults = Mocker.javaDefaultClasses.mapTo(mutableSetOf()) { it.id }
5858
val defaultTimeEstimator = ExecutionTimeEstimator(UtSettings.utBotGenerationTimeoutInMillis, 1)
5959

60-
val forceMockListener = ForceMockListener.create(this, conflictTriggers, cancelJob = false)
61-
val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers, cancelJob = false)
60+
val forceMockListener = ForceMockListener.create(this, conflictTriggers)
61+
val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers)
6262

6363
runBlocking {
6464
val controller = EngineController()

0 commit comments

Comments
 (0)