use dwergaz from git

cabal.project

@@ -0,0 +1,6 @@
+packages: .
+
+source-repository-package
+    type: git
+    location: https://github.com/henrytill/dwergaz
+    tag: a07426a6e679721730bab68f9d8ce93edc270992

lens-toml-parser.cabal

@@ -44,7 +44,7 @@ test-suite tests
   main-is:             Main.hs
   build-depends:       base        >=4.14 && <5
                      , containers  >=0.5  && <0.8
-                     , dwergaz     >=0.2  && <0.3
+                     , dwergaz     >=0.2
                      , lens-family >=2.1  && <2.2
                      , text        >=0.2  && <3
                      , toml-parser >=2.0  && <2.1

test/Main.hs

@@ -42,9 +42,8 @@ mapAt k = valueAt k . _Table
 
 testTableKey :: Table -> Test
 testTableKey kv =
-  Expect
+  assertEqual
     "'key' from 'table' == Just \"value\""
-    (==)
     expected
     actual
   where
@@ -53,9 +52,8 @@ testTableKey kv =
 
 testTableZoo :: Table -> Test
 testTableZoo kv =
-  Expect
+  assertEqual
     "'zoo' from 'table' == Nothing"
-    (==)
     expected
     actual
   where
@@ -64,9 +62,8 @@ testTableZoo kv =
 
 testTableSubtableKey :: Table -> Test
 testTableSubtableKey kv =
-  Expect
+  assertEqual
     "'key' from 'subtable' from 'table' == Just \"another value\""
-    (==)
     expected
     actual
   where
@@ -75,9 +72,8 @@ testTableSubtableKey kv =
 
 testTableInlineNameFirst :: Table -> Test
 testTableInlineNameFirst kv =
-  Expect
+  assertEqual
     "'first' from 'name' from 'inline' from 'table' == \"Tom\""
-    (==)
     expected
     actual
   where
@@ -86,9 +82,8 @@ testTableInlineNameFirst kv =
 
 testTableInlinePointY :: Table -> Test
 testTableInlinePointY kv =
-  Expect
+  assertEqual
     "'y' from 'point' from 'inline' from 'table' == Just 2"
-    (==)
     expected
     actual
   where
@@ -97,9 +92,8 @@ testTableInlinePointY kv =
 
 testStringBasicBasic :: Table -> Test
 testStringBasicBasic kv =
-  Expect
+  assertEqual
     "'basic' from 'basic' from 'string' == <some escaped nonsense>"
-    (==)
     expected
     actual
   where
@@ -108,31 +102,28 @@ testStringBasicBasic kv =
 
 testStringMultiline :: Table -> Test
 testStringMultiline kv =
-  Predicate
+  assertBool
     "'key1', 'key2', and 'key3' from 'multiline' from 'string' are all the same"
-    allEqual
-    [actual1, actual2, actual3]
+    (allEqual [actual1, actual2, actual3])
   where
     actual1 = kv ^? mapAt "string" . mapAt "multiline" . valueAt "key1" . _Text
     actual2 = kv ^? mapAt "string" . mapAt "multiline" . valueAt "key2" . _Text
     actual3 = kv ^? mapAt "string" . mapAt "multiline" . valueAt "key3" . _Text
 
 testStringMultilineContinued :: Table -> Test
 testStringMultilineContinued kv =
-  Predicate
+  assertBool
     "'key1', 'key2', and 'key3' from 'continued' from 'multiline' from 'string' are all the same"
-    allEqual
-    [actual1, actual2, actual3]
+    (allEqual [actual1, actual2, actual3])
   where
     actual1 = kv ^? mapAt "string" . mapAt "multiline" . mapAt "continued" . valueAt "key1" . _Text
     actual2 = kv ^? mapAt "string" . mapAt "multiline" . mapAt "continued" . valueAt "key2" . _Text
     actual3 = kv ^? mapAt "string" . mapAt "multiline" . mapAt "continued" . valueAt "key3" . _Text
 
 testArrayKey1 :: Table -> Test
 testArrayKey1 kv =
-  Expect
+  assertEqual
     "'key1' from 'array' == [1, 2, 3]"
-    (==)
     expected
     actual
   where
@@ -164,5 +155,5 @@ main :: IO ()
 main = do
   ex <- readTomlFile "./example/example-v0.4.0.toml"
   let rs = runTests ex
-  mapM_ print rs
-  unless (all isPassed rs) exitFailure
+  mapM_ (putStrLn . resultToString) rs
+  unless (all resultIsPassed rs) exitFailure