slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests and bugfix for accountNameTreeFrom

Browse Source
This commit is contained in:
Simon Michael 2009-03-15 04:02:04 +00:00
parent 2dac5754c7
commit 80f20bdad8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Ledger/AccountName.hs
View File

@ -60,13 +60,6 @@ subAccountNamesFrom accts a = filter (`isSubAccountNameOf` a) accts
-- tree with boring accounts elided. This converts a list of -- tree with boring accounts elided. This converts a list of
-- AccountName to a tree (later we will convert that to a tree of -- AccountName to a tree (later we will convert that to a tree of
-- 'Account'.) -- 'Account'.)
accountNameTreeFrom_props =
[
accountNameTreeFrom ["a"] == Node "top" [Node "a" []],
accountNameTreeFrom ["a","b"] == Node "top" [Node "a" [], Node "b" []],
accountNameTreeFrom ["a","a:b"] == Node "top" [Node "a" [Node "a:b" []]],
accountNameTreeFrom ["a:b"] == Node "top" [Node "a" [Node "a:b" []]]
]
accountNameTreeFrom :: [AccountName] -> Tree AccountName accountNameTreeFrom :: [AccountName] -> Tree AccountName
accountNameTreeFrom accts = accountNameTreeFrom accts =
Node "top" (accountsFrom (topAccountNames accts)) Node "top" (accountsFrom (topAccountNames accts))
@ -74,7 +67,7 @@ accountNameTreeFrom accts =
accountsFrom :: [AccountName] -> [Tree AccountName] accountsFrom :: [AccountName] -> [Tree AccountName]
accountsFrom [] = [] accountsFrom [] = []
accountsFrom as = [Node a (accountsFrom $ subs a) | a <- as] accountsFrom as = [Node a (accountsFrom $ subs a) | a <- as]
subs = (subAccountNamesFrom accts) subs = subAccountNamesFrom (expandAccountNames accts)
-- | Elide an account name to fit in the specified width. -- | Elide an account name to fit in the specified width.
-- From the ledger 2.6 news: -- From the ledger 2.6 news:

7
Tests.hs
View File

@ -95,6 +95,13 @@ tests = [
"liabilities","liabilities:credit cards","liabilities:credit cards:discover"] "liabilities","liabilities:credit cards","liabilities:credit cards:discover"]
, ,
"accountNameTreeFrom" ~: do
accountNameTreeFrom ["a"] `is` Node "top" [Node "a" []]
accountNameTreeFrom ["a","b"] `is` Node "top" [Node "a" [], Node "b" []]
accountNameTreeFrom ["a","a:b"] `is` Node "top" [Node "a" [Node "a:b" []]]
accountNameTreeFrom ["a:b:c"] `is` Node "top" [Node "a" [Node "a:b" [Node "a:b:c" []]]]
,
"amount arithmetic" ~: do "amount arithmetic" ~: do
let a1 = dollars 1.23 let a1 = dollars 1.23
let a2 = Amount (comm "$") (-1.23) Nothing let a2 = Amount (comm "$") (-1.23) Nothing