diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs index b3833e49c..8574eff06 100644 --- a/hledger-lib/Hledger/Read/JournalReader.hs +++ b/hledger-lib/Hledger/Read/JournalReader.hs @@ -977,7 +977,7 @@ tests_JournalReader = tests "JournalReader" [ ,test "defaultcommoditydirectivep" $ do assertParse defaultcommoditydirectivep "D $1,000.0\n" - assertParseError defaultcommoditydirectivep "D $1000\n" "please include a decimal separator" + assertParseError defaultcommoditydirectivep "D $1000\n" "Please include a decimal point or decimal comma" ,tests "defaultyeardirectivep" [ test "1000" $ assertParse defaultyeardirectivep "Y 1000" -- XXX no \n like the others diff --git a/tests/journal/amounts-and-commodities.test b/tests/journal/amounts-and-commodities.test index 1ae275d05..6a0a67905 100644 --- a/tests/journal/amounts-and-commodities.test +++ b/tests/journal/amounts-and-commodities.test @@ -115,7 +115,7 @@ $ hledger -f- bal -V -N # TODO #749 -# 9. Here the amount is parsed as 1. I think (hope) no country uses space +# 8. Here the amount is parsed as 1. I think (hope) no country uses space # for decimal point, so we should parse this as 1000. < 2018-01-01 @@ -123,7 +123,7 @@ $ hledger -f- bal -V -N $ hledger -f- reg amt:1 -# 10. This commodity directive should complain about a missing decimal separator, +# 9. This commodity directive should complain about a missing decimal separator, # which we now require. < commodity 1 000 USD @@ -132,10 +132,10 @@ commodity 1 000 USD (a) USD1 000 $ hledger -f- bal ->2 /decimal separator/ +>2 /decimal point or decimal comma/ >=1 -# 11. After a space-grouped amount, a posting comment should parse. +# 10. After a space-grouped amount, a posting comment should parse. < 2018-01-01 (a) USD 1 000 ;comment @@ -143,7 +143,7 @@ $ hledger -f- bal $ hledger -f- print > // # any stdout, no stderr, 0 exit code -# 12. After a space-grouped amount, trailing whitespace should parse. +# 11. After a space-grouped amount, trailing whitespace should parse. < 2018-01-01 (a) USD 1 000 @@ -151,7 +151,7 @@ $ hledger -f- print $ hledger -f- print > // # any stdout, no stderr, 0 exit code -# 13. Example of surprising decimal mark parsing behaviour. +# 12. Example of surprising decimal mark parsing behaviour. # Without a commodity declaration, these amounts are parsed as 10 and 10000. # < # 2000/1/1 @@ -162,4 +162,4 @@ $ hledger -f- print # could not balance this transaction (real postings are off by $9,990,000) # 2000-01-01 # a $-10,000 -# b $10,000,000 \ No newline at end of file +# b $10,000,000 diff --git a/tests/journal/numbers.test b/tests/journal/numbers.test index 0b51a9ec0..4597f347c 100644 --- a/tests/journal/numbers.test +++ b/tests/journal/numbers.test @@ -130,7 +130,7 @@ commodity €1,000.00 hledger bal -f - <<< commodity 1000 EUR ->>>2 /please include a decimal separator/ +>>>2 /Please include a decimal point or decimal comma/ >>>=1 # 12. Commodity directive with zero precision