Better error-messages

1 files changed, 7 insertions, 4 deletions

diff --git a/tests/encoding.test b/tests/encoding.test
index 1c12be0..114b296 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -585,19 +585,22 @@ test encoding-24.12 {Parse valid or invalid utf-8} {
 } 1
 test encoding-24.13 {Parse valid or invalid utf-8} -body {
     encoding convertfrom utf-8 "\xC0\x81" -stoponerror
-} -returnCodes 1 -result {decoding error after reading 0 bytes}
+} -returnCodes 1 -result {unexpected byte at index 0: 'À' (\xC0)}
 test encoding-24.14 {Parse valid or invalid utf-8} -body {
     encoding convertfrom utf-8 "\xC1\xBF" -stoponerror
-} -returnCodes 1 -result {decoding error after reading 0 bytes}
+} -returnCodes 1 -result {unexpected byte at index 0: 'Á' (\xC1)}
 test encoding-24.15 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xC2\x80" -stoponerror]
 } 1
 test encoding-24.16 {Parse valid or invalid utf-8} -body {
     encoding convertfrom utf-8 "Z\xE0\x80" -stoponerror
-} -returnCodes 1 -result {decoding error after reading 1 byte}
+} -returnCodes 1 -result {unexpected byte at index 1: 'à' (\xE0)}
 test encoding-24.17 {Parse valid or invalid utf-8} -constraints testbytestring -body {
+    encoding convertto utf-8 [testbytestring "Z\u4343\x80"] -stoponerror
+} -returnCodes 1 -result {expected byte sequence but character 1 was '䍃€' (U+004343)}
+test encoding-24.18 {Parse valid or invalid utf-8} -constraints testbytestring -body {
     encoding convertto utf-8 [testbytestring "Z\xE0\x80"] -stoponerror
-} -returnCodes 1 -result {encoding error after reading 1 character}
+} -returnCodes 1 -match glob -result {unexpected character at index 1: '*' (U+0000E0)}
 
 file delete [file join [temporaryDirectory] iso2022.txt]