test cleanups

This commit is contained in:
Simon Michael 2007-02-10 23:32:45 +00:00
parent 948f20a33e
commit 98c9ef538b

View File

@ -154,7 +154,9 @@ ledger7_str = "\
\ assets:checking \n\ \ assets:checking \n\
\\n" --" \\n" --"
ledger7 = Ledger [] [] ledger7 = Ledger
[]
[]
[ [
Entry { Entry {
date="2007/01/01", status=False, code="*", description="opening balance", date="2007/01/01", status=False, code="*", description="opening balance",
@ -200,6 +202,21 @@ ledger7 = Ledger [] []
-- expenses:food:dining $6.48 -- expenses:food:dining $6.48
-- assets:checking -- assets:checking
-- parseTest ledgerentry entry2_str
-- parseTest ledgerentry entry3_str
-- parseTest ledgerperiodicentry periodic_entry1_str
-- parseTest ledgerperiodicentry periodic_entry2_str
-- parseTest ledgerperiodicentry periodic_entry3_str
-- parseTest ledger ledger1_str
-- parseTest ledger ledger2_str
-- parseTest ledger ledger3_str
-- parseTest ledger ledger4_str
-- parseTest ledger ledger5_str
-- parseTest ledger ledger6_str
-- parseTest ledger periodic_entry1_str
-- parseTest ledger periodic_entry2_str
-- parseLedgerFile ledgerFilePath >>= printParseResult
-- utils -- utils
assertEqual' e a = assertEqual "" e a assertEqual' e a = assertEqual "" e a
@ -220,20 +237,19 @@ parseEquals parsed other =
-- hunit tests -- hunit tests
-- parseTest ledgerentry entry2_str tests = let t l f = TestLabel l $ TestCase f in TestList
-- parseTest ledgerentry entry3_str [
-- parseTest ledgerperiodicentry periodic_entry1_str t "test_ledgertransaction" test_ledgertransaction
-- parseTest ledgerperiodicentry periodic_entry2_str , t "test_ledgerentry" test_ledgerentry
-- parseTest ledgerperiodicentry periodic_entry3_str , t "test_autofillEntry" test_autofillEntry
-- parseTest ledger ledger1_str , t "test_expandAccounts" test_expandAccounts
-- parseTest ledger ledger2_str , t "test_accountTree" test_accountTree
-- parseTest ledger ledger3_str ]
-- parseTest ledger ledger4_str
-- parseTest ledger ledger5_str tests2 = Test.HUnit.test
-- parseTest ledger ledger6_str [
-- parseTest ledger periodic_entry1_str "test1" ~: assertEqual "2 equals 2" 2 2
-- parseTest ledger periodic_entry2_str ]
-- parseLedgerFile ledgerFilePath >>= printParseResult
test_ledgertransaction :: Assertion test_ledgertransaction :: Assertion
test_ledgertransaction = test_ledgertransaction =
@ -257,27 +273,13 @@ test_accountTree =
["assets","assets:cash","assets:checking","equity","equity:opening balances","expenses","expenses:vacation"] ["assets","assets:cash","assets:checking","equity","equity:opening balances","expenses","expenses:vacation"]
(accountTree ledger7) (accountTree ledger7)
tests = let t l f = TestLabel l $ TestCase f in TestList
[
t "test_ledgertransaction" test_ledgertransaction
, t "test_ledgerentry" test_ledgerentry
, t "test_autofillEntry" test_autofillEntry
, t "test_expandAccounts" test_expandAccounts
, t "test_accountTree" test_accountTree
]
tests2 = Test.HUnit.test
[
"test1" ~: assertEqual "2 equals 2" 2 2
]
-- quickcheck properties -- quickcheck properties
props = props =
[ [
(parse' ledgertransaction transaction1_str) `parseEquals` parse' ledgertransaction transaction1_str `parseEquals`
(Transaction "expenses:food:dining" (Amount "$" 10)) (Transaction "expenses:food:dining" (Amount "$" 10))
, ,
(accountTree ledger7) == accountTree ledger7 ==
["assets","assets:cash","assets:checking","equity","equity:opening balances","expenses","expenses:vacation"] ["assets","assets:cash","assets:checking","equity","equity:opening balances","expenses","expenses:vacation"]
] ]