Merge 8.7

1 files changed, 12 insertions, 6 deletions

diff --git a/tests/encoding.test b/tests/encoding.test
index 270c351..1b41925 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -459,17 +459,20 @@ test encoding-15.26 {UtfToUtfProc CESU-8} {
     encoding convertfrom cesu-8 \xC0\x80
 } \x00
 test encoding-15.27 {UtfToUtfProc -strict CESU-8} {
-    encoding convertfrom -strict cesu-8 \xC0\x80
+    encoding convertfrom -strict cesu-8 \x00
 } \x00
-test encoding-15.28 {UtfToUtfProc -strict CESU-8} {
+test encoding-15.28 {UtfToUtfProc -strict CESU-8} -body {
     encoding convertfrom -strict cesu-8 \xC0\x80
-} \x00
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
 test encoding-15.29 {UtfToUtfProc CESU-8} {
     encoding convertto cesu-8 \x00
-} \xC0\x80
+} \x00
 test encoding-15.30 {UtfToUtfProc -strict CESU-8} {
     encoding convertto -strict cesu-8 \x00
-} \xC0\x80
+} \x00
+test encoding-15.31 {UtfToUtfProc -strict CESU-8 (bytes F0-F4 are invalid)} -body {
+    encoding convertfrom -strict cesu-8 \xF1\x86\x83\x9C
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xF1'}
 
 test encoding-16.1 {Utf16ToUtfProc} -body {
     set val [encoding convertfrom utf-16 NN]
@@ -617,9 +620,12 @@ test encoding-19.3 {TableFromUtfProc} -body {
 test encoding-19.4 {TableFromUtfProc} -body {
     list [encoding convertfrom -failindex idx ascii AÁ] [set idx]
 } -result {A 1}
-test encoding-19.4 {TableFromUtfProc} -body {
+test encoding-19.5 {TableFromUtfProc} -body {
     list [encoding convertfrom -failindex idx -strict ascii AÁ] [set idx]
 } -result {A 1}
+test encoding-19.6 {TableFromUtfProc} -body {
+    list [encoding convertfrom -failindex idx -strict ascii AÁB] [set idx]
+} -result {A 1}
 
 test encoding-20.1 {TableFreefProc} {
 } {}