From 51618adc37ce09d2fd9bd42d043a0e893d60157a Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 4 Sep 2018 13:39:21 -0700
Subject: [PATCH] tests: use is in a few more places

---
 hledger-lib/Hledger/Read/CsvReader.hs | 18 +++++++++---------
 hledger-lib/Hledger/Utils/Text.hs     | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs
index 66d1581a7..e0aceeaed 100644
--- a/hledger-lib/Hledger/Read/CsvReader.hs
+++ b/hledger-lib/Hledger/Read/CsvReader.hs
@@ -833,23 +833,23 @@ parseDateWithFormatOrDefaultFormats mformat s = firstJust $ map parsewith format
 -- tests
 
 easytests_CsvReader = tests "CsvReader" [
-  tests "rulesp" [
+   tests "parseCsvRules" [
      test "empty file" $
-      expectEq' (Right rules) (parseCsvRules "unknown" "")
-  
-    ,test "trailing comments" $
-      expectEq' (Right rules{rdirectives = [("skip","")]}) (parseWithState' rules rulesp "skip\n# \n#\n")
+      parseCsvRules "unknown" "" `is` Right rules
+    ]
+  ,tests "rulesp" [
+     test "trailing comments" $
+      parseWithState' rules rulesp "skip\n# \n#\n" `is` Right rules{rdirectives = [("skip","")]}
   
     ,test "trailing blank lines" $
-      expectEq' (Right rules{rdirectives = [("skip","")]}) (parseWithState' rules rulesp "skip\n\n  \n")
+      parseWithState' rules rulesp "skip\n\n  \n" `is` (Right rules{rdirectives = [("skip","")]})
   
     ,test "no final newline" $
-      expectEq' (Right rules{rdirectives=[("skip","")]}) (parseWithState' rules rulesp "skip")
+      parseWithState' rules rulesp "skip" `is` (Right rules{rdirectives=[("skip","")]})
 
     ,test "assignment with empty value" $
-      expectEq' 
+      parseWithState' rules rulesp "account1 \nif foo\n  account2 foo\n" `is` 
         (Right rules{rassignments = [("account1","")], rconditionalblocks = [([["foo"]],[("account2","foo")])]})
-        (parseWithState' rules rulesp "account1 \nif foo\n  account2 foo\n")
 
     ]
   ]
diff --git a/hledger-lib/Hledger/Utils/Text.hs b/hledger-lib/Hledger/Utils/Text.hs
index 4d7056acb..e84013aea 100644
--- a/hledger-lib/Hledger/Utils/Text.hs
+++ b/hledger-lib/Hledger/Utils/Text.hs
@@ -422,12 +422,12 @@ textWidth s = maximum $ map (T.foldr (\a b -> charWidth a + b) 0) $ T.lines s
 
 easytests_Text = tests "Text" [
    tests "quoteIfSpaced" [
-     expectEq' "a'a" (quoteIfSpaced "a'a")
-    ,expectEq' "a\"a" (quoteIfSpaced "a\"a")              
-    ,expectEq' "\"a a\"" (quoteIfSpaced "a a")               
-    ,expectEq' "\"mimi's cafe\"" (quoteIfSpaced "mimi's cafe")       
-    ,expectEq' "\"\\\"alex\\\" cafe\"" (quoteIfSpaced "\"alex\" cafe")     
-    ,expectEq' "\"le'shan's cafe\"" (quoteIfSpaced "le'shan's cafe")    
-    ,expectEq' "\"\\\"be'any's\\\" cafe\"" (quoteIfSpaced "\"be'any's\" cafe") 
+     quoteIfSpaced "a'a" `is` "a'a"
+    ,quoteIfSpaced "a\"a" `is` "a\"a"              
+    ,quoteIfSpaced "a a" `is` "\"a a\""               
+    ,quoteIfSpaced "mimi's cafe" `is` "\"mimi's cafe\""       
+    ,quoteIfSpaced "\"alex\" cafe" `is` "\"\\\"alex\\\" cafe\""     
+    ,quoteIfSpaced "le'shan's cafe" `is` "\"le'shan's cafe\""    
+    ,quoteIfSpaced "\"be'any's\" cafe" `is` "\"\\\"be'any's\\\" cafe\"" 
     ] 
   ]