test util cleanups

This commit is contained in:
Simon Michael 2009-04-01 04:57:05 +00:00
parent 0693723aee
commit 8256a4fcbd
2 changed files with 7 additions and 12 deletions

View File

@ -217,12 +217,7 @@ strace a = trace (show a) a
-- | labelled trace - like strace, with a newline and a label prepended
ltrace :: Show a => String -> a -> a
ltrace l a = trace ("\n" ++ l ++ ": " ++ show a) a
-- testing
assertequal e a = assertEqual "" e a
assertnotequal e a = assertBool "expected inequality, got equality" (e /= a)
ltrace l a = trace (l ++ ": " ++ show a) a
-- parsing

View File

@ -43,9 +43,9 @@ tfilter p (TestLabel l ts) = TestLabel l (tfilter p ts)
tfilter p (TestList ts) = TestList $ filter (any p . tflatten) $ map (tfilter p) ts
tfilter _ t = t
-- | Assert something `is` some expected value.
-- | Simple way to assert something is some expected value, with no label.
is :: (Eq a, Show a) => a -> a -> Assertion
is = flip assertequal
a `is` e = assertEqual "" a e
-- | Assert a parse result is some expected value, or print a parse error.
parseis :: (Show a, Eq a) => (Either ParseError a) -> a -> Assertion