From 96cbc4697c1422c939eeb4639441bac5acccafe9 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 13 Jul 2022 17:58:46 +0100
Subject: [PATCH] dev: errors: update tests

---
 hledger/test/errors/accounts.test             | 16 ++++++++----
 hledger/test/errors/assertions.test           | 25 ++++++++++---------
 hledger/test/errors/balanced.test             | 15 +++++------
 .../test/errors/balancednoautoconversion.test | 19 +++++++-------
 hledger/test/errors/commodities.test          | 16 ++++++++----
 hledger/test/errors/ordereddates.test         | 16 ++++++++----
 hledger/test/errors/parseable-dates.test      |  9 ++++---
 hledger/test/errors/parseable-regexps.test    | 10 +++++---
 hledger/test/errors/parseable.test            |  6 ++---
 hledger/test/errors/payees.test               | 15 +++++++----
 hledger/test/errors/uniqueleafnames.test      | 17 ++++++++-----
 11 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/hledger/test/errors/accounts.test b/hledger/test/errors/accounts.test
index 79c152046..491793f78 100644
--- a/hledger/test/errors/accounts.test
+++ b/hledger/test/errors/accounts.test
@@ -1,9 +1,15 @@
 $$$ hledger check accounts -f accounts.j
->>>2 /hledger: Error: .*accounts.j:4:6-6:
-  | 2022-01-01
-4 |     (a)               1
-  |      ^
-undeclared account "a"
+>>>2 /hledger: Error: .*accounts.j:4:
+  \| 2022-01-01
+4 \|     \(a\)               1
+  \|      \^
+
+Strict account checking is enabled, and
+account "a" has not been declared.
+Consider adding an account directive. Examples:
+
+account a
+account a    ; type:A  ; \(L,E,R,X,C,V\)
 
 /
 >>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/assertions.test b/hledger/test/errors/assertions.test
index 4afea2b94..28ddcf7c1 100644
--- a/hledger/test/errors/assertions.test
+++ b/hledger/test/errors/assertions.test
@@ -1,14 +1,15 @@
-$ hledger check -f assertions.j
->2 /hledger: Error: balance assertion: .*assertions.j:4:8:
-  | 2022-01-01
-4 |     a               0 = 1
-  | ^^^^^^^^^^
-
-account:    a                             
-commodity:                                
-asserted:   0
-actual:     1
-difference: 1
+$$$ hledger check -f assertions.j
+>>>2 /hledger: Error: .*assertions.j:4:8:
+  \| 2022-01-01
+4 \|     a               0 = 1
+  \|                       \^\^\^
 
+This balance assertion failed.
+In account:    a
+and commodity: 
+this balance was asserted: 1
+but the actual balance is: 0
+a difference of:           1
+.*
 /
->=1
\ No newline at end of file
+>>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/balanced.test b/hledger/test/errors/balanced.test
index 73f0c87b2..dbd9c341e 100644
--- a/hledger/test/errors/balanced.test
+++ b/hledger/test/errors/balanced.test
@@ -1,9 +1,10 @@
-$ hledger check -f balanced.j
->2 /hledger: Error: unbalanced transaction: .*balanced.j:3-4:
-3 | 2022-01-01
-  |     a               1
-
-real postings' sum should be 0 but is: 1
+$$$ hledger check -f balanced.j
+>>>2 /hledger: Error: .*balanced.j:3-4:
+3 \| 2022-01-01
+  \|     a               1
 
+This transaction is unbalanced.
+The real postings' sum should be 0 but is: 1
+Consider adjusting this entry's amounts, or adding missing postings.
 /
->= 1
\ No newline at end of file
+>>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/balancednoautoconversion.test b/hledger/test/errors/balancednoautoconversion.test
index 94de0f47e..e0741e3e1 100644
--- a/hledger/test/errors/balancednoautoconversion.test
+++ b/hledger/test/errors/balancednoautoconversion.test
@@ -1,11 +1,12 @@
-$ hledger check balancednoautoconversion -f balancednoautoconversion.j
->2 /hledger: Error: unbalanced transaction: .*balancednoautoconversion.j:6-8:
-6 | 2022-01-01
-  |     a             1 A
-  |     b            -1 B
-
-real postings' sum should be 0 but is:  1 A
--1 B
+$$$ hledger check balancednoautoconversion -f balancednoautoconversion.j
+>>>2 /hledger: Error: .*balancednoautoconversion.j:6-8:
+6 \| 2022-01-01
+  \|     a             1 A
+  \|     b            -1 B
 
+This multi-commodity transaction is unbalanced.
+Automatic commodity conversion is not enabled.
+The real postings' sum should be 0 but is: 1 A, -1 B
+.*
 /
->= 1
\ No newline at end of file
+>>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/commodities.test b/hledger/test/errors/commodities.test
index 6ecd7c466..a382a75ee 100644
--- a/hledger/test/errors/commodities.test
+++ b/hledger/test/errors/commodities.test
@@ -1,9 +1,15 @@
 $$$ hledger check commodities -f commodities.j
->>>2 /hledger: Error: .*commodities.j:6:21-23:
-  | 2022-01-01
-6 |     (a)             A 1
-  |                     ^^^
-undeclared commodity "A"
+>>>2 /hledger: Error: .*commodities.j:6:
+  \| 2022-01-01
+6 \|     \(a\)             A 1
+  \|                     \^\^\^
+
+Strict commodity checking is enabled, and
+commodity "A" has not been declared.
+Consider adding a commodity directive. Examples:
+
+commodity A1000.00
+commodity 1.000,00 A
 
 /
 >>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/ordereddates.test b/hledger/test/errors/ordereddates.test
index 7cc02a644..ee53796b0 100644
--- a/hledger/test/errors/ordereddates.test
+++ b/hledger/test/errors/ordereddates.test
@@ -1,8 +1,14 @@
 $$$ hledger check ordereddates -f ordereddates.j
->>>2 /hledger: Error: .*ordereddates.j:10:1-10:
-10 | 2022-01-01 p
-   | ^^^^^^^^^^
-   |     (a)               1
-transaction date is out of order with previous transaction date 2022-01-02
+>>>2 /hledger: Error: .*ordereddates.j:10:
+7 \| 2022-01-02 p
+  \|     \(a\)               1
+ 
+10 \| 2022-01-01 p
+   \| \^\^\^\^\^\^\^\^\^\^
+   \|     \(a\)               1
+
+Ordered dates checking is enabled, and this transaction's
+date \(2022-01-01\) is out of order with the previous transaction.
+.*
 /
 >>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/parseable-dates.test b/hledger/test/errors/parseable-dates.test
index b08e652f9..08d46dea0 100644
--- a/hledger/test/errors/parseable-dates.test
+++ b/hledger/test/errors/parseable-dates.test
@@ -1,9 +1,10 @@
 $$$ hledger check -f parseable-dates.j
 >>>2 /hledger: Error: .*parseable-dates.j:3:1:
-  |
-3 | 2022\/1\/32
-  | ^^^^^^^^^
-well-formed but invalid date: 2022\/1\/32
+  \|
+3 \| 2022\/1\/32
+  \| \^\^\^\^\^\^\^\^\^
+
+This date is invalid, please correct it: 2022\/1\/32
 
 /
 >>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/parseable-regexps.test b/hledger/test/errors/parseable-regexps.test
index 958e5a8b3..344d32721 100644
--- a/hledger/test/errors/parseable-regexps.test
+++ b/hledger/test/errors/parseable-regexps.test
@@ -1,9 +1,11 @@
 $$$ hledger check -f parseable-regexps.j
 >>>2 /hledger: Error: .*parseable-regexps.j:3:8:
-  |
-3 | alias \/\(\/ = a
-  |        ^
-this regular expression could not be compiled: \(
+  \|
+3 \| alias \/\(\/ = a
+  \|        \^
+
+This regular expression is malformed, please correct it:
+\(
 
 /
 >>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/parseable.test b/hledger/test/errors/parseable.test
index e99de9e52..b639ea8f8 100644
--- a/hledger/test/errors/parseable.test
+++ b/hledger/test/errors/parseable.test
@@ -1,8 +1,8 @@
 $$$ hledger check -f parseable.j
 >>>2 /hledger: Error: .*parseable.j:3:2:
-  |
-3 | 1
-  |  ^
+  \|
+3 \| 1
+  \|  \^
 unexpected newline
 expecting date separator or digit
 
diff --git a/hledger/test/errors/payees.test b/hledger/test/errors/payees.test
index c46874bdc..b891ac1e3 100644
--- a/hledger/test/errors/payees.test
+++ b/hledger/test/errors/payees.test
@@ -1,9 +1,14 @@
 $$$ hledger check payees -f payees.j
->>>2 /hledger: Error: .*payees.j:6:12-12:
-6 | 2022-01-01 p
-  |            ^
-  |     (a)             A 1
-undeclared payee "p"
+>>>2 /hledger: Error: .*payees.j:6:
+6 \| 2022-01-01 p
+  \|            \^
+  \|     \(a\)             A 1
+
+Strict payee checking is enabled, and
+payee "p" has not been declared.
+Consider adding a payee directive. Examples:
+
+payee p
 
 /
 >>>= 1
\ No newline at end of file
diff --git a/hledger/test/errors/uniqueleafnames.test b/hledger/test/errors/uniqueleafnames.test
index 6934a3e32..8ac8dd66e 100644
--- a/hledger/test/errors/uniqueleafnames.test
+++ b/hledger/test/errors/uniqueleafnames.test
@@ -1,9 +1,14 @@
 $$$ hledger check uniqueleafnames -f uniqueleafnames.j
->>>2 /hledger: Error: .*uniqueleafnames.j:9:8-8:
-  | 2022-01-01 p
-9 |     (a:c)               1
-  |        ^
-account leaf name "c" is not unique
-it is used in account names: "a:c", "b:c"
+>>>2 /hledger: Error: .*uniqueleafnames.j:12:
+  \| 2022-01-01 p
+9 \|     \(a:c\)               1
+ ...
+   \| 2022-01-01 p
+12 \|     \(b:c\)               1
+   \|        \^
+
+Checking for unique account leaf names is enabled, and
+account leaf name "c" is not unique.
+.*
 /
 >>>= 1
\ No newline at end of file