Some style improvements to job cancellation

Author: EgorkaKulikov

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

@@ -12,17 +12,21 @@ import org.utbot.framework.util.ConflictTriggers
  *
  * Supposed to be created only if Mockito is not installed.
  */
-class ForceMockListener private constructor(triggers: ConflictTriggers, private val cancelJob: Boolean): MockListener(triggers) {
+class ForceMockListener private constructor(triggers: ConflictTriggers, private val shouldCancelJob: Boolean): MockListener(triggers) {
  override fun onShouldMock(controller: EngineController, strategy: MockStrategy, mockInfo: UtMockInfo) {
  // If force mocking happened -- сancel engine job
- if (cancelJob) controller.job?.cancel(ForceMockCancellationException())
+ if (shouldCancelJob) controller.job?.cancel(ForceMockCancellationException())
 
  triggers[Conflict.ForceMockHappened] = true
  }
 
  companion object {
- fun create(testCaseGenerator: TestCaseGenerator, conflictTriggers: ConflictTriggers, cancelJob: Boolean = true) : ForceMockListener {
- val listener = ForceMockListener(conflictTriggers, cancelJob)
+ fun create(
+ testCaseGenerator: TestCaseGenerator,
+ conflictTriggers: ConflictTriggers,
+ shouldCancelJob: Boolean = false,
+ ) : ForceMockListener {
+ val listener = ForceMockListener(conflictTriggers, shouldCancelJob)
  testCaseGenerator.engineActions.add { engine -> engine.attachMockListener(listener) }
 
  return listener

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

@@ -16,21 +16,25 @@ import org.utbot.framework.util.ConflictTriggers
  *
  * Supposed to be created only if Mockito inline is not installed.
  */
-class ForceStaticMockListener private constructor(triggers: ConflictTriggers, private val cancelJob: Boolean): MockListener(triggers) {
+class ForceStaticMockListener private constructor(triggers: ConflictTriggers, private val shouldCancelJob: Boolean): MockListener(triggers) {
  override fun onShouldMock(controller: EngineController, strategy: MockStrategy, mockInfo: UtMockInfo) {
  if (mockInfo is UtNewInstanceMockInfo
  || mockInfo is UtStaticMethodMockInfo
  || mockInfo is UtStaticObjectMockInfo) {
  // If force static mocking happened -- сancel engine job
- if (cancelJob) controller.job?.cancel(ForceStaticMockCancellationException())
+ if (shouldCancelJob) controller.job?.cancel(ForceStaticMockCancellationException())
 
  triggers[Conflict.ForceStaticMockHappened] = true
  }
  }
 
  companion object {
- fun create(testCaseGenerator: TestCaseGenerator, conflictTriggers: ConflictTriggers, cancelJob: Boolean = true) : ForceStaticMockListener {
- val listener = ForceStaticMockListener(conflictTriggers, cancelJob)
+ fun create(
+ testCaseGenerator: TestCaseGenerator,
+ conflictTriggers: ConflictTriggers,
+ shouldCancelJob: Boolean = false,
+ ) : ForceStaticMockListener {
+ val listener = ForceStaticMockListener(conflictTriggers, shouldCancelJob)
  testCaseGenerator.engineActions.add { engine -> engine.attachMockListener(listener) }
 
  return listener

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

@@ -149,8 +149,8 @@ open class TestCaseGenerator(
  val method2errors = methods.associateWith { mutableMapOf<String, Int>() }
 
  val conflictTriggers = ConflictTriggers()
- val forceMockListener = ForceMockListener.create(this, conflictTriggers, cancelJob = false)
- val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers, cancelJob = false)
+ val forceMockListener = ForceMockListener.create(this, conflictTriggers)
+ val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers)
 
  runIgnoringCancellationException {
  runBlockingWithCancellationPredicate(isCanceled) {

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

@@ -102,11 +102,11 @@ private fun EngineProcessModel.setup(kryoHelper: KryoHelper, watchdog: IdleWatch
  val mockFrameworkInstalled = params.mockInstalled
  val conflictTriggers = ConflictTriggers(kryoHelper.readObject(params.conflictTriggers))
  if (!mockFrameworkInstalled) {
- ForceMockListener.create(testGenerator, conflictTriggers, cancelJob = true)
+ ForceMockListener.create(testGenerator, conflictTriggers, shouldCancelJob = true)
  }
  val staticsMockingConfigured = params.staticsMockingIsConfigureda
  if (!staticsMockingConfigured) {
- ForceStaticMockListener.create(testGenerator, conflictTriggers, cancelJob = true)
+ ForceStaticMockListener.create(testGenerator, conflictTriggers, shouldCancelJob = true)
  }
 
  val generateFlow = when (testGenerator.applicationContext) {

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

@@ -57,8 +57,8 @@ class TestSpecificTestCaseGenerator(
  val mockAlwaysDefaults = Mocker.javaDefaultClasses.mapTo(mutableSetOf()) { it.id }
  val defaultTimeEstimator = ExecutionTimeEstimator(UtSettings.utBotGenerationTimeoutInMillis, 1)
 
- val forceMockListener = ForceMockListener.create(this, conflictTriggers, cancelJob = false)
- val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers, cancelJob = false)
+ val forceMockListener = ForceMockListener.create(this, conflictTriggers)
+ val forceStaticMockListener = ForceStaticMockListener.create(this, conflictTriggers)
 
  runBlocking {
  val controller = EngineController()