Review comments

Author: MaximilianAlgehed

quickcheck-dynamic/src/Test/QuickCheck/DynamicLogic/Internal.hs

@@ -297,7 +297,8 @@ prettyWitnesses Do{} = []
 instance StateModel s => Show (DynLogicTest s) where
   show (BadPrecondition is ss bad s) =
     "-- Initial state: "
-      ++ show is
+      ++ show s
+      ++ "\n"
       ++ prettyTestSequence (usedVariables is ss <> allVariables bad) ss
       ++ "\n   -- In state: "
       ++ show s
@@ -312,21 +313,17 @@ instance StateModel s => Show (DynLogicTest s) where
             | p == PosPolarity = "action"
             | otherwise = "failingAction"
   show (Looping is ss) =
-    "-- Initial state: "
-      ++ show is
-      ++ prettyTestSequence (usedVariables is ss) ss
-      ++ "\n   pure ()\n   -- Looping"
+    showTest is ss
+      ++ "\n   -- Looping"
   show (Stuck is ss s) =
-    "-- Initial state: "
-      ++ show is
-      ++ prettyTestSequence (usedVariables is ss) ss
-      ++ "\n   pure ()\n   -- Stuck in state "
+    showTest is ss
+      ++ "\n   -- Stuck in state "
       ++ show s
   show (DLScript is ss) =
-    "-- Initial state: "
-      ++ show is
-      ++ prettyTestSequence (usedVariables is ss) ss
-      ++ "\n   pure ()\n"
+    showTest is ss
+
+showTest :: StateModel s => Annotated s -> TestSequence s -> String
+showTest is ss = "-- Initial state: " ++ show is ++ "\n" ++ prettyTestSequence (usedVariables is ss) ss ++ "\n   pure ()"
 
 usedVariables :: forall s. StateModel s => Annotated s -> TestSequence s -> VarContext
 usedVariables s = go s

quickcheck-dynamic/src/Test/QuickCheck/StateModel.hs

@@ -328,7 +328,11 @@ instance Eq (Step state) where
 -- We also collect a list of names of actions which were generated,
 -- but were then rejected by their precondition.
 
-data Actions state = Actions_ [String] state (Smart [Step state])
+data Actions state = Actions_
+  { actionsRejected :: [String]
+  , actionsInitialState :: state
+  , actionsSteps :: Smart [Step state]
+  }
   deriving (Generic)
 
 pattern Actions :: state -> [Step state] -> Actions state