From 2b2d643333d9d7426f2ba3159d31981d55420a41 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 18 Mar 2022 06:59:33 -1000 Subject: [PATCH] test: errors: make tests runnable --- hledger-lib/Hledger/Read/Common.hs | 2 +- hledger/test/errors/failing-balance-assertion.j | 2 +- hledger/test/errors/invalid-date.j | 2 +- hledger/test/errors/invalid-regex.j | 2 +- hledger/test/errors/nonunique-leaf-names.j | 2 +- hledger/test/errors/parse-error.j | 2 +- hledger/test/errors/showall | 4 ++++ hledger/test/errors/unbalanced-txn.j | 2 +- hledger/test/errors/undeclared-acct.j | 2 +- hledger/test/errors/undeclared-commodity.j | 2 +- hledger/test/errors/undeclared-payee.j | 2 +- hledger/test/errors/unordered-dates.j | 2 +- 12 files changed, 15 insertions(+), 11 deletions(-) mode change 100644 => 100755 hledger/test/errors/failing-balance-assertion.j mode change 100644 => 100755 hledger/test/errors/invalid-date.j mode change 100644 => 100755 hledger/test/errors/invalid-regex.j mode change 100644 => 100755 hledger/test/errors/nonunique-leaf-names.j mode change 100644 => 100755 hledger/test/errors/parse-error.j create mode 100755 hledger/test/errors/showall mode change 100644 => 100755 hledger/test/errors/unbalanced-txn.j mode change 100644 => 100755 hledger/test/errors/undeclared-acct.j mode change 100644 => 100755 hledger/test/errors/undeclared-commodity.j mode change 100644 => 100755 hledger/test/errors/undeclared-payee.j mode change 100644 => 100755 hledger/test/errors/unordered-dates.j diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs index 8846ac4cb..30b4faa8c 100644 --- a/hledger-lib/Hledger/Read/Common.hs +++ b/hledger-lib/Hledger/Read/Common.hs @@ -392,7 +392,7 @@ journalCheckAccountsDeclared j = mapM_ checkacct (journalPostings j) ++ case ptransaction of Nothing -> "" Just t -> printf "in transaction at: %s\n\n%s" - (sourcePosPairPretty $ tsourcepos t) + (sourcePosPairPrettxy $ tsourcepos t) (linesPrepend " " . (<>"\n") . textChomp $ showTransaction t) where as = journalAccountNamesDeclared j diff --git a/hledger/test/errors/failing-balance-assertion.j b/hledger/test/errors/failing-balance-assertion.j old mode 100644 new mode 100755 index 0f462cfba..dd12be20f --- a/hledger/test/errors/failing-balance-assertion.j +++ b/hledger/test/errors/failing-balance-assertion.j @@ -1,4 +1,4 @@ -# hledger check +#!/usr/bin/env -S hledger check -f 1/1 a 0 = 1 diff --git a/hledger/test/errors/invalid-date.j b/hledger/test/errors/invalid-date.j old mode 100644 new mode 100755 index 88631afd6..6c0f001e4 --- a/hledger/test/errors/invalid-date.j +++ b/hledger/test/errors/invalid-date.j @@ -1,4 +1,4 @@ -# hledger check +#!/usr/bin/env -S hledger check -f 2022/1/32 (a:c) 1 diff --git a/hledger/test/errors/invalid-regex.j b/hledger/test/errors/invalid-regex.j old mode 100644 new mode 100755 index 3ebbc68d8..e46dd8468 --- a/hledger/test/errors/invalid-regex.j +++ b/hledger/test/errors/invalid-regex.j @@ -1,3 +1,3 @@ -# hledger check +#!/usr/bin/env -S hledger check -f alias /(/ = a diff --git a/hledger/test/errors/nonunique-leaf-names.j b/hledger/test/errors/nonunique-leaf-names.j old mode 100644 new mode 100755 index 24949412f..095eba941 --- a/hledger/test/errors/nonunique-leaf-names.j +++ b/hledger/test/errors/nonunique-leaf-names.j @@ -1,4 +1,4 @@ -# hledger check uniqueleafnames +#!/usr/bin/env -S hledger check uniqueleafnames -f account a:c ; XXX check uniqueleafnames doesn't notice these account b:c ; diff --git a/hledger/test/errors/parse-error.j b/hledger/test/errors/parse-error.j old mode 100644 new mode 100755 index a6f6fc085..f4e8ae0c3 --- a/hledger/test/errors/parse-error.j +++ b/hledger/test/errors/parse-error.j @@ -1,3 +1,3 @@ -# hledger check +#!/usr/bin/env -S hledger check -f 1 diff --git a/hledger/test/errors/showall b/hledger/test/errors/showall new file mode 100755 index 000000000..ea789cba8 --- /dev/null +++ b/hledger/test/errors/showall @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +# execute all journals, showing their error message + +for f in *.j; do echo $f:; ./$f || true; done diff --git a/hledger/test/errors/unbalanced-txn.j b/hledger/test/errors/unbalanced-txn.j old mode 100644 new mode 100755 index f0bb771c7..766899d1f --- a/hledger/test/errors/unbalanced-txn.j +++ b/hledger/test/errors/unbalanced-txn.j @@ -1,4 +1,4 @@ -# hledger check +#!/usr/bin/env -S hledger check -f 1/1 a 1 diff --git a/hledger/test/errors/undeclared-acct.j b/hledger/test/errors/undeclared-acct.j old mode 100644 new mode 100755 index 595bf1cd4..d47d3f986 --- a/hledger/test/errors/undeclared-acct.j +++ b/hledger/test/errors/undeclared-acct.j @@ -1,4 +1,4 @@ -# hledger check accounts +#!/usr/bin/env -S hledger check accounts -f 1/1 (a) 1 diff --git a/hledger/test/errors/undeclared-commodity.j b/hledger/test/errors/undeclared-commodity.j old mode 100644 new mode 100755 index 26f47dfa9..f066dd6d7 --- a/hledger/test/errors/undeclared-commodity.j +++ b/hledger/test/errors/undeclared-commodity.j @@ -1,4 +1,4 @@ -# hledger check commodities +#!/usr/bin/env -S hledger check commodities -f account a diff --git a/hledger/test/errors/undeclared-payee.j b/hledger/test/errors/undeclared-payee.j old mode 100644 new mode 100755 index 67f5374b6..cc682c97c --- a/hledger/test/errors/undeclared-payee.j +++ b/hledger/test/errors/undeclared-payee.j @@ -1,4 +1,4 @@ -# hledger check payees +#!/usr/bin/env -S hledger check payees -f account a commodity A diff --git a/hledger/test/errors/unordered-dates.j b/hledger/test/errors/unordered-dates.j old mode 100644 new mode 100755 index b0296228a..6c0d99ae3 --- a/hledger/test/errors/unordered-dates.j +++ b/hledger/test/errors/unordered-dates.j @@ -1,4 +1,4 @@ -# hledger check ordereddates +#!/usr/bin/env -S hledger check ordereddates -f account a commodity 1.