Save schedule when error found by JUnit plugin. (#73)

cmu-pasta · Dec 14, 2024 · 910d201 · 910d201
1 parent c3be45c
commit 910d201
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/junit/src/main/kotlin/FrayExtension.kt b/junit/src/main/kotlin/FrayExtension.kt
@@ -22,7 +22,7 @@ class FrayExtension(
       extensionContext: ExtensionContext
   ): T {
     frayContext.config.currentIteration = index
-    if (frayContext.config.currentIteration != 0) {
+    if (frayContext.config.currentIteration != 1) {
       frayContext.config.scheduler = frayContext.config.scheduler.nextIteration()
       frayContext.config.randomnessProvider = ControlledRandom()
     }
@@ -50,6 +50,7 @@ class FrayExtension(
 
   override fun testFailed(context: ExtensionContext, cause: Throwable) {
     frayJupiterContext.bugFound = true
+    frayContext.reportError(cause)
   }
 
   override fun evaluateExecutionCondition(context: ExtensionContext?): ConditionEvaluationResult {

diff --git a/junit/src/main/kotlin/FrayTestExtension.kt b/junit/src/main/kotlin/FrayTestExtension.kt
@@ -1,10 +1,11 @@
 package org.pastalab.fray.junit
 
+import java.io.File
 import java.lang.reflect.Method
 import java.nio.file.Paths
 import java.util.stream.Stream
 import kotlin.io.path.absolutePathString
-import kotlin.io.path.createTempDirectory
+import kotlinx.serialization.json.Json
 import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext
 import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider
@@ -17,6 +18,7 @@ import org.pastalab.fray.core.command.ExecutionInfo
 import org.pastalab.fray.core.command.LambdaExecutor
 import org.pastalab.fray.core.randomness.ControlledRandom
 import org.pastalab.fray.core.scheduler.POSScheduler
+import org.pastalab.fray.core.scheduler.Scheduler
 import org.pastalab.fray.junit.annotations.ConcurrencyTest
 
 class FrayTestExtension : TestTemplateInvocationContextProvider {
@@ -40,8 +42,18 @@ class FrayTestExtension : TestTemplateInvocationContextProvider {
     if (!workDir.toFile().exists()) {
       workDir.toFile().mkdirs()
     }
-    val workDir = createTempDirectory(this.workDir).absolutePathString()
-    val schedulerInfo = concurrencyTest.scheduler
+    val (scheduler, random) =
+        if (concurrencyTest.replay.isNotEmpty()) {
+          val path = concurrencyTest.replay
+          val randomPath = "${path}/random.json"
+          val schedulerPath = "${path}/schedule.json"
+          val randomnessProvider =
+              Json.decodeFromString<ControlledRandom>(File(randomPath).readText())
+          val scheduler = Json.decodeFromString<Scheduler>(File(schedulerPath).readText())
+          Pair(scheduler, randomnessProvider)
+        } else {
+          Pair(POSScheduler(), ControlledRandom())
+        }
     val config =
         Configuration(
             ExecutionInfo(
@@ -51,11 +63,11 @@ class FrayTestExtension : TestTemplateInvocationContextProvider {
                 false,
                 -1,
             ),
-            workDir,
+            workDir.absolutePathString(),
             totalRepetition(concurrencyTest, testMethod),
             60,
-            POSScheduler(),
-            ControlledRandom(),
+            scheduler,
+            random,
             false,
             false,
             true,

diff --git a/junit/src/main/kotlin/annotations/ConcurrencyTest.kt b/junit/src/main/kotlin/annotations/ConcurrencyTest.kt
@@ -16,9 +16,10 @@ import org.pastalab.fray.core.scheduler.Scheduler
 )
 @TestTemplate
 annotation class ConcurrencyTest(
-    val value: Int,
+    val value: Int = 1,
     val scheduler: KClass<out Scheduler> = POSScheduler::class,
     val name: String = SHORT_DISPLAY_NAME,
+    val replay: String = ""
 ) {
   companion object {