fixes after rebase

Signed-off-by: Evgenii Moiseenko <[email protected]>
JetBrains · Apr 24, 2023 · 83233a3 · 83233a3
1 parent a8f4231
commit 83233a3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/LinChecker.kt b/src/jvm/main/org/jetbrains/kotlinx/lincheck/LinChecker.kt
@@ -91,7 +91,7 @@ class LinChecker(private val testClass: Class<*>, options: Options<*, *>?) {
             if (failure != null) {
                 val minimizedFailedIteration = if (minimizeFailedScenario)
                     failure.minimize(reporter) {
-                        it.run(this, createVerifier(checkStateEquivalence = false))
+                        it.run(this, createVerifier())
                     }
                else
                     failure

diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/LincheckOptions.kt b/src/jvm/main/org/jetbrains/kotlinx/lincheck/LincheckOptions.kt
@@ -216,7 +216,7 @@ internal class LincheckOptionsImpl : LincheckOptions {
                 minOperations = DEFAULT_MIN_OPERATIONS,
                 maxOperations = maxOperationsInThread,
                 generateBeforeAndAfterParts = generateBeforeAndAfterParts,
-                scenarioGenerator = RandomExecutionGenerator(testStructure)
+                scenarioGenerator = RandomExecutionGenerator(testStructure, testStructure.randomProvider)
             )
         }
     }

diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/stress/StressCTestConfiguration.kt b/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/stress/StressCTestConfiguration.kt
@@ -49,9 +49,9 @@ class StressCTestConfiguration(
     timeoutMs = timeoutMs,
     customScenarios = customScenarios
 ) {
-    override fun createStrategy(testClass: Class<*>, scenario: ExecutionScenario, validationFunctions: List<Method>,
-                                stateRepresentationMethod: Method?, verifier: Verifier, invocationPlanner: InvocationPlanner): Strategy =
-        StressStrategy(this, testClass, scenario, validationFunctions, stateRepresentationMethod, verifier, invocationPlanner)
+    override fun createStrategy(testClass: Class<*>, scenario: ExecutionScenario,
+                                validationFunctions: List<Method>, stateRepresentationMethod: Method?): Strategy =
+        StressStrategy(testClass, scenario, validationFunctions, stateRepresentationMethod, timeoutMs)
 
     companion object {
         const val DEFAULT_INVOCATIONS = 10000

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/generator/ParamGeneratorsTests.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/generator/ParamGeneratorsTests.kt
@@ -17,6 +17,7 @@
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-3.0.html>
  */
+@file:Suppress("DEPRECATION_ERROR", "DEPRECATION")
 
 package org.jetbrains.kotlinx.lincheck.test.generator
 

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/AllowExtraSuspensionTest.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/AllowExtraSuspensionTest.kt
@@ -84,17 +84,6 @@ class OnlyExtraSuspensionsHaveToBeAtomicTest : AbstractLincheckTest() {
         if (c == 6) return
         suspendCancellableCoroutine<Unit> {  }
     }
-<<<<<<< HEAD
-
-    override fun <O : Options<O, *>> O.customize() {
-        iterations(10)
-        actorsBefore(0)
-        threads(2)
-        actorsPerThread(3)
-        actorsAfter(0)
-    }
-=======
->>>>>>> LincheckOptions
 }
 
 class CounterSequential : VerifierState() {