test cleanup

Tests.hs

@@ -118,35 +118,39 @@ assertParseEqual expected parsed =
       Left e -> parseError e
       Right v  -> assertEqual " " expected v
 
+assertEqual' e a = assertEqual "" e a
+
 parse' p ts = parse p "" ts
 
+    
 -- hunit tests
 
-test_parse_ledgertransaction = TestCase (
-  assertParseEqual
-    (Transaction "expenses:food:dining" (Amount "$" 10))
-    (parse' ledgertransaction sample_transaction))
+test_parse_ledgertransaction :: Assertion
+test_parse_ledgertransaction =
+    assertParseEqual
+      (Transaction "expenses:food:dining" (Amount "$" 10))
+      (parse' ledgertransaction sample_transaction)
+
+entry2 =
+    (Entry "2007/01/28" False "" "coopportunity" 
+               [Transaction "expenses:food:groceries" (Amount "$" 47.18), 
+                Transaction "assets:checking" (Amount "" 0)])
+
+test_parse_ledgerentry =
+  assertParseEqual entry2 (parse' ledgerentry sample_entry2)
+
+test_show_entry =
+  assertEqual'
+    "2007/01/28 coopportunity\n    expenses:food:groceries                                 $47.18\n    assets:checking                                            0.0\n"
+    (show entry2)
 
---   parseTest ledgertransaction sample_transaction2
---   parseTest ledgerentry sample_entry
---   parseTest ledgerentry sample_entry2
---   parseTest ledgerentry sample_entry3
---   parseTest ledgerperiodicentry sample_periodic_entry
---   parseTest ledgerperiodicentry sample_periodic_entry2
---   parseTest ledgerperiodicentry sample_periodic_entry3
---   parseTest ledger sample_ledger
---   parseTest ledger sample_ledger2
---   parseTest ledger sample_ledger3
---   parseTest ledger sample_ledger4
---   parseTest ledger sample_ledger5
---   parseTest ledger sample_ledger6
---   parseTest ledger sample_periodic_entry
---   parseTest ledger sample_periodic_entry2
---   parseLedgerFile ledgerFile >>= printParseResult
 
 hunittests = TestList [
-                       TestLabel "test_parse_ledgertransaction" test_parse_ledgertransaction
+                       test "test_parse_ledgertransaction" test_parse_ledgertransaction
+                      , test "test_parse_ledgerentry" test_parse_ledgerentry
+                      , test "test_show_entry" test_show_entry
                       ] 
+    where test label fn = TestLabel label $ TestCase fn
 
 hunittests2 = Test.HUnit.test [
                                "test1" ~: assertEqual "2 equals 2" 2 2
@@ -168,3 +172,18 @@ test = do
   runTestTT hunittests
   runTestTT hunittests2
   quickCheck prop1
+  parseTest ledgertransaction sample_transaction2
+  parseTest ledgerentry sample_entry2
+--   parseTest ledgerentry sample_entry3
+--   parseTest ledgerperiodicentry sample_periodic_entry
+--   parseTest ledgerperiodicentry sample_periodic_entry2
+--   parseTest ledgerperiodicentry sample_periodic_entry3
+--   parseTest ledger sample_ledger
+--   parseTest ledger sample_ledger2
+--   parseTest ledger sample_ledger3
+--   parseTest ledger sample_ledger4
+--   parseTest ledger sample_ledger5
+--   parseTest ledger sample_ledger6
+--   parseTest ledger sample_periodic_entry
+--   parseTest ledger sample_periodic_entry2
+--   parseLedgerFile ledgerFilePath >>= printParseResult