From 03e68f392538332b1da6c99d68733c41801bed6e Mon Sep 17 00:00:00 2001 From: Brian Wignall Date: Mon, 6 Jan 2020 11:37:14 -0500 Subject: [PATCH] Get "make functest" working again --- tests/balancesheet.test | 18 +++++++++--------- tests/cashflow.test | 2 +- tests/incomestatement.test | 2 +- tests/journal/directives-account.test | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/balancesheet.test b/tests/balancesheet.test index 318b9cf13..cd5f6029d 100644 --- a/tests/balancesheet.test +++ b/tests/balancesheet.test @@ -5,7 +5,7 @@ hledger -f - balancesheet assets 1 b >>> -Balance Sheet 2016/01/01 +Balance Sheet 2016-01-01 || 2016-01-01 =============++============ @@ -48,7 +48,7 @@ Balance Sheet 2016/01/01 # hledger -f sample.journal balancesheet -p 'monthly in 2008' >>> -Balance Sheet 2008/01/31,,2008/12/31 +Balance Sheet 2008-01-31,,2008-12-31 || 2008-01-31 2008-02-29 2008-03-31 2008-04-30 2008-05-31 2008-06-30 2008-07-31 2008-08-31 2008-09-30 2008-10-31 2008-11-30 2008-12-31 ======================++================================================================================================================================================ @@ -94,7 +94,7 @@ Balance Sheet 2008/01/31,,2008/12/31 # hledger -f sample.journal balancesheet -p 'monthly in 2008' --tree >>> -Balance Sheet 2008/01/31,,2008/12/31 +Balance Sheet 2008-01-31,,2008-12-31 || 2008-01-31 2008-02-29 2008-03-31 2008-04-30 2008-05-31 2008-06-30 2008-07-31 2008-08-31 2008-09-30 2008-10-31 2008-11-30 2008-12-31 ==============++================================================================================================================================================ @@ -123,7 +123,7 @@ Balance Sheet 2008/01/31,,2008/12/31 # by default (shows ending balances). hledger -f sample.journal balancesheet -p 'monthly in 2008' -NAT >>> -Balance Sheet 2008/01/31,,2008/12/31 +Balance Sheet 2008-01-31,,2008-12-31 || 2008-01-31 2008-02-29 2008-03-31 2008-04-30 2008-05-31 2008-06-30 2008-07-31 2008-08-31 2008-09-30 2008-10-31 2008-11-30 2008-12-31 Average ======================++========================================================================================================================================================= @@ -148,7 +148,7 @@ hledger -f- balancesheet 2017/1/1 (assets:b) 1 >>> -Balance Sheet 2017/01/01 +Balance Sheet 2017-01-01 || 2017-01-01 =============++============ @@ -174,7 +174,7 @@ hledger -f- balancesheet --flat 2017/1/1 (assets:b) 1 >>> -Balance Sheet 2017/01/01 +Balance Sheet 2017-01-01 || 2017-01-01 =============++============ @@ -199,7 +199,7 @@ hledger -f- balancesheet -YA 2017/1/1 (assets) $1 >>> -Balance Sheet 2017/12/31 +Balance Sheet 2017-12-31 || 2017-12-31 Average =============++===================== @@ -225,7 +225,7 @@ hledger -f - balancesheet -M --pretty-tables assets 1 b >>> -Balance Sheet 2016/01/31 +Balance Sheet 2016-01-31 ║ 2016-01-31 ═════════════╬════════════ @@ -262,7 +262,7 @@ hledger -f - balancesheet assets:this account should not disappear:subaccount -$10 assets:this account should not disappear >>> -Balance Sheet 2018/10/03 +Balance Sheet 2018-10-03 || 2018-10-03 =====================================++============ diff --git a/tests/cashflow.test b/tests/cashflow.test index 315dadf86..e911a4428 100644 --- a/tests/cashflow.test +++ b/tests/cashflow.test @@ -175,7 +175,7 @@ Cashflow Statement 2008 # 7. Multicolumn test (historical) hledger -f sample.journal cashflow -p 'monthly in 2008' -A --historical >>> -Cashflow Statement 2008/01/31,,2008/12/31 (Historical Ending Balances) +Cashflow Statement 2008-01-31,,2008-12-31 (Historical Ending Balances) || 2008-01-31 2008-02-29 2008-03-31 2008-04-30 2008-05-31 2008-06-30 2008-07-31 2008-08-31 2008-09-30 2008-10-31 2008-11-30 2008-12-31 Average ======================++========================================================================================================================================================= diff --git a/tests/incomestatement.test b/tests/incomestatement.test index 907f4a094..360e4bdf9 100644 --- a/tests/incomestatement.test +++ b/tests/incomestatement.test @@ -263,7 +263,7 @@ Income Statement 2008 # hledger -f sample.journal incomestatement -p 'monthly in 2008' --historical >>> -Income Statement 2008/01/31,,2008/12/31 (Historical Ending Balances) +Income Statement 2008-01-31,,2008-12-31 (Historical Ending Balances) || 2008-01-31 2008-02-29 2008-03-31 2008-04-30 2008-05-31 2008-06-30 2008-07-31 2008-08-31 2008-09-30 2008-10-31 2008-11-30 2008-12-31 ===================++================================================================================================================================================ diff --git a/tests/journal/directives-account.test b/tests/journal/directives-account.test index 4b615cb70..36eacd582 100644 --- a/tests/journal/directives-account.test +++ b/tests/journal/directives-account.test @@ -25,7 +25,7 @@ account b L (b:bb) 3 $ hledger -f - bs -N --flat -Balance Sheet 2018/01/01 +Balance Sheet 2018-01-01 || 2018-01-01 =============++============ @@ -46,7 +46,7 @@ Balance Sheet 2018/01/01 # It must be shown above bb, but since not an asset, its balance is excluded there. # It is shown again in the liabilities section, this time with balance. $ hledger -f - bs -N -Balance Sheet 2018/01/01 +Balance Sheet 2018-01-01 || 2018-01-01 =============++============