From 41cd8c3e06ccc57214570a85d0e12c964ab0446b Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 15 Jul 2022 10:38:00 +0100 Subject: [PATCH] dev: errors: small csv error test fixes --- hledger/test/errors/README.md | 6 +----- hledger/test/errors/csvamountonenonzero.csv | 2 +- hledger/test/errors/csvamountonenonzero.test | 2 +- hledger/test/errors/csvamountparse.csv | 2 +- hledger/test/errors/csvamountparse.test | 2 +- hledger/test/errors/csvbalanceparse.csv | 2 +- hledger/test/errors/csvbalanceparse.test | 2 +- hledger/test/errors/csvdateformat.csv | 2 +- hledger/test/errors/csvnoinclude.j | 2 +- hledger/test/errors/csvnoinclude.test | 7 +------ hledger/test/errors/csvstatusparse.csv | 1 + hledger/test/errors/csvstatusparse.csv.rules | 2 +- 12 files changed, 12 insertions(+), 20 deletions(-) diff --git a/hledger/test/errors/README.md b/hledger/test/errors/README.md index 36aae67a0..7d995b097 100644 --- a/hledger/test/errors/README.md +++ b/hledger/test/errors/README.md @@ -453,11 +453,7 @@ line of conditional table should have 2 values, but this one has only 1 ### csvnoinclude ``` -hledger: Error: /Users/simon/src/hledger/hledger/test/errors/./csvnoinclude.j:4:23: - | -4 | include csvinclude.csv - | ^ -No existing files match pattern: csvinclude.csv +hledger: Error: sorry, CSV files can't be included yet ``` diff --git a/hledger/test/errors/csvamountonenonzero.csv b/hledger/test/errors/csvamountonenonzero.csv index c278cb3b5..d5fab1db8 100755 --- a/hledger/test/errors/csvamountonenonzero.csv +++ b/hledger/test/errors/csvamountonenonzero.csv @@ -1,4 +1,4 @@ -#!/usr/bin/env -S hledger print -f +#!/usr/bin/env -S hledger check -f # Non-zero for both amount-in and amount-out. 2022-01-01,1, 2022-01-02,1,0 diff --git a/hledger/test/errors/csvamountonenonzero.test b/hledger/test/errors/csvamountonenonzero.test index a396001bc..bba33dc90 100644 --- a/hledger/test/errors/csvamountonenonzero.test +++ b/hledger/test/errors/csvamountonenonzero.test @@ -1,4 +1,4 @@ -$$$ hledger print -f csvamountonenonzero.csv +$$$ hledger check -f csvamountonenonzero.csv >>>2 /hledger: Error: multiple non-zero amounts assigned, please ensure just one. \(https:\/\/hledger.org\/csv.html#amount\) record values: "2022-01-03","1","2" diff --git a/hledger/test/errors/csvamountparse.csv b/hledger/test/errors/csvamountparse.csv index 3792544ee..d037bc5a6 100755 --- a/hledger/test/errors/csvamountparse.csv +++ b/hledger/test/errors/csvamountparse.csv @@ -1,4 +1,4 @@ -#!/usr/bin/env -S hledger print -f +#!/usr/bin/env -S hledger check -f # Unparseable amount. 2022-01-01,1 2022-01-02,$1 diff --git a/hledger/test/errors/csvamountparse.test b/hledger/test/errors/csvamountparse.test index 46d80fa01..4f4281b05 100644 --- a/hledger/test/errors/csvamountparse.test +++ b/hledger/test/errors/csvamountparse.test @@ -1,4 +1,4 @@ -$$$ hledger print -f csvamountparse.csv +$$$ hledger check -f csvamountparse.csv >>>2 /hledger: Error: error: could not parse "badamount" as an amount record values: "2022-01-03","badamount" the amount rule is: %2 diff --git a/hledger/test/errors/csvbalanceparse.csv b/hledger/test/errors/csvbalanceparse.csv index 0ed4bd55b..2750b5f14 100755 --- a/hledger/test/errors/csvbalanceparse.csv +++ b/hledger/test/errors/csvbalanceparse.csv @@ -1,3 +1,3 @@ -#!/usr/bin/env -S hledger print -f +#!/usr/bin/env -S hledger check -f # Unparseable balance amount. 2022-01-03,badbalance diff --git a/hledger/test/errors/csvbalanceparse.test b/hledger/test/errors/csvbalanceparse.test index 4a99f05b2..7b890a1a1 100644 --- a/hledger/test/errors/csvbalanceparse.test +++ b/hledger/test/errors/csvbalanceparse.test @@ -1,4 +1,4 @@ -$$$ hledger print -f csvbalanceparse.csv +$$$ hledger check -f csvbalanceparse.csv >>>2 /hledger: Error: error: could not parse "badbalance" as balance1 amount record values: "2022-01-03","badbalance" the balance rule is: %2 diff --git a/hledger/test/errors/csvdateformat.csv b/hledger/test/errors/csvdateformat.csv index 73e45ec4c..6eb5baefc 100755 --- a/hledger/test/errors/csvdateformat.csv +++ b/hledger/test/errors/csvdateformat.csv @@ -1,4 +1,4 @@ #!/usr/bin/env -S hledger print -f # See rules (missing/bad date-format rule). -# Note check doesn't show this error; print was needed. +# Note check doesn't show this error, print is needed. a,b diff --git a/hledger/test/errors/csvnoinclude.j b/hledger/test/errors/csvnoinclude.j index 6d54945ad..6de64961c 100755 --- a/hledger/test/errors/csvnoinclude.j +++ b/hledger/test/errors/csvnoinclude.j @@ -1,6 +1,6 @@ #!/usr/bin/env -S hledger check -f # Trying to include a CSV file. -include csvinclude.csv +include csvnoinclude.csv diff --git a/hledger/test/errors/csvnoinclude.test b/hledger/test/errors/csvnoinclude.test index 6f302749e..58208a4de 100644 --- a/hledger/test/errors/csvnoinclude.test +++ b/hledger/test/errors/csvnoinclude.test @@ -1,9 +1,4 @@ $$$ hledger check -f csvnoinclude.j ->>>2 /hledger: Error: .*csvnoinclude.j:4:23: - \| -4 \| include csvinclude.csv - \| \^ -No existing files match pattern: csvinclude.csv - +>>>2 /hledger: Error: sorry, CSV files can't be included yet / >>>= 1 diff --git a/hledger/test/errors/csvstatusparse.csv b/hledger/test/errors/csvstatusparse.csv index 240ee00aa..ec30d9819 100755 --- a/hledger/test/errors/csvstatusparse.csv +++ b/hledger/test/errors/csvstatusparse.csv @@ -1,5 +1,6 @@ #!/usr/bin/env -S hledger print -f # Status value not parseable. +# check not sufficient to show this error, print is needed 2022-01-01,* 2022-01-02,! 2022-01-03, diff --git a/hledger/test/errors/csvstatusparse.csv.rules b/hledger/test/errors/csvstatusparse.csv.rules index 95e216085..79829b1d2 100644 --- a/hledger/test/errors/csvstatusparse.csv.rules +++ b/hledger/test/errors/csvstatusparse.csv.rules @@ -1,3 +1,3 @@ -skip 2 +skip 3 date %1 status %2