Easier diff when assertOn follows assertOutputContains

haskell · Dec 21, 2024 · ae7ff21 · ae7ff21
1 parent b477512
commit ae7ff21
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/cabal-testsuite/src/Test/Cabal/Prelude.hs b/cabal-testsuite/src/Test/Cabal/Prelude.hs
@@ -799,6 +799,18 @@ recordMode mode = withReaderT (\env -> env {
     testRecordUserMode = Just mode
     })
 
+assertOutputContains :: MonadIO m => WithCallStack (String -> Result -> m ())
+assertOutputContains = assertOn
+    needleHaystack
+        {txHaystack = TxContains{txBwd = decodeLfMarkLines, txFwd = encodeLf}}
+
+assertOutputDoesNotContain :: MonadIO m => WithCallStack (String -> Result -> m ())
+assertOutputDoesNotContain = assertOn
+    needleHaystack
+        { expectNeedleInHaystack = False
+        , txHaystack = TxContains{txBwd = decodeLfMarkLines, txFwd = encodeLf}
+        }
+
 assertOn :: MonadIO m => WithCallStack (NeedleHaystack -> String -> Result -> m ())
 assertOn NeedleHaystack{..} (txFwd txNeedle -> needle) (txFwd txHaystack. resultOutput -> output) =
     withFrozenCallStack $
@@ -814,16 +826,6 @@ assertOn NeedleHaystack{..} (txFwd txNeedle -> needle) (txFwd txHaystack. result
                 then "\nin output:\n" ++ (txBwd txHaystack output)
                 else ""
 
-assertOutputContains :: MonadIO m => WithCallStack (String -> Result -> m ())
-assertOutputContains = assertOn needleHaystack{txHaystack = TxContains{txBwd = decodeLfMarkLines, txFwd = encodeLf}}
-
-assertOutputDoesNotContain :: MonadIO m => WithCallStack (String -> Result -> m ())
-assertOutputDoesNotContain = assertOn
-    needleHaystack
-        { expectNeedleInHaystack = False
-        , txHaystack = TxContains{txBwd = decodeLfMarkLines, txFwd = encodeLf}
-        }
-
 assertFindInFile :: MonadIO m => WithCallStack (String -> FilePath -> m ())
 assertFindInFile needle path =
     withFrozenCallStack $