Merge 8.7

tcltk · Sep 28, 2023 · 813a5e9 · 813a5e9
2 parents 46892ac + 41883cb
commit 813a5e9
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/tests/encoding.test b/tests/encoding.test
@@ -449,10 +449,7 @@ test encoding-15.24 {UtfToUtfProc CESU-8 bug [048dd20b4171c8da]} {
 test encoding-15.25 {UtfToUtfProc CESU-8} {
     encoding convertfrom cesu-8 \x00
 } \x00
-test {encoding-15.26 cesu-8 tclnull strict} {UtfToUtfProc CESU-8} {
-    encoding convertfrom -profile tcl8 cesu-8 \xC0\x80
-} \x00
-test {encoding-15.26 cesu-8 tclnull tcl8} {UtfToUtfProc CESU-8} {
+test encoding-15.26 {UtfToUtfProc CESU-8} {
     encoding convertfrom -profile tcl8 cesu-8 \xC0\x80
 } \x00
 test encoding-15.27 {UtfToUtfProc -profile strict CESU-8} {
@@ -492,11 +489,11 @@ test encoding-16.5 {Ucs2ToUtfProc} -body {
     list $val [format %x [scan $val %c]]
 } -result "\U460DC 460dc"
 test encoding-16.6 {Utf32ToUtfProc} -body {
-    set val [encoding convertfrom -profile strict utf-32le NN\0\0]
+    set val [encoding convertfrom utf-32le NN\0\0]
     list $val [format %x [scan $val %c]]
 } -result "乎 4e4e"
 test encoding-16.7 {Utf32ToUtfProc} -body {
-    set val [encoding convertfrom -profile strict utf-32be \0\0NN]
+    set val [encoding convertfrom utf-32be \0\0NN]
     list $val [format %x [scan $val %c]]
 } -result "乎 4e4e"
 test encoding-16.8 {Utf32ToUtfProc} -body {
@@ -550,22 +547,24 @@ test encoding-16.18 {
 	return done
     } [namespace current]]
 } -result done
-test {encoding-16.19 strict} {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
+test encoding-16.19.strict {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
     encoding convertfrom -profile strict utf-16 "\x41\x41\x41"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 2: '\x41'}
-test {encoding-16.19 tcl8} {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
+test encoding-16.19.tcl8 {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
     encoding convertfrom -profile tcl8 utf-16 "\x41\x41\x41"
 } -result \u4141\uFFFD
-test encoding-16.20 {utf16ToUtfProc, bug [d19fe0a5b]} -body {
-    encoding convertfrom utf-16 "\xD8\xD8"
+test encoding-16.20.tcl8 {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
+    encoding convertfrom -profile tcl8 utf-16 "\xD8\xD8"
 } -result \uD8D8
+test encoding-16.20.strict {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
+    encoding convertfrom -profile strict utf-16 "\xD8\xD8"
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xD8'}
 test encoding-16.21.tcl8 {Utf32ToUtfProc, bug [d19fe0a5b]} -body {
     encoding convertfrom -profile tcl8 utf-32 "\x00\x00\x00\x00\x41\x41"
 } -result \x00\uFFFD
 test encoding-16.21.strict {Utf32ToUtfProc, bug [d19fe0a5b]} -body {
     encoding convertfrom -profile strict utf-32 "\x00\x00\x00\x00\x41\x41"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 4: '\x41'}
-
 test encoding-16.22 {Utf16ToUtfProc, strict, bug [db7a085bd9]} -body {
     encoding convertfrom -profile strict utf-16le \x00\xD8
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\x00'}
@@ -575,10 +574,10 @@ test encoding-16.23 {Utf16ToUtfProc, strict, bug [db7a085bd9]} -body {
 test encoding-16.24 {Utf32ToUtfProc} -body {
     encoding convertfrom -profile tcl8 utf-32 "\xFF\xFF\xFF\xFF"
 } -result \uFFFD
-test {encoding-16.25 strict} {Utf32ToUtfProc} -body {
+test encoding-16.25.strict {Utf32ToUtfProc} -body {
     encoding convertfrom -profile strict utf-32 "\x01\x00\x00\x01"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\x01'}
-test {encoding-16.25 tcl8} {Utf32ToUtfProc} -body {
+test encoding-16.25.tcl8 {Utf32ToUtfProc} -body {
     encoding convertfrom -profile tcl8 utf-32 "\x01\x00\x00\x01"
 } -result \uFFFD
 
@@ -763,10 +762,10 @@ test encoding-24.3 {EscapeFreeProc on open channels} {stdio} {
     list $count $line
 } [list 3 乎乞也]
 
-test {encoding-24.4 utf-8 invalid strict} {Parse invalid utf-8, strict} -body {
+test encoding-24.4.strict {Parse invalid utf-8, strict} -body {
     encoding convertfrom -profile strict utf-8 "\xC0\x80"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
-test {encoding-24.4 utf-8 invalid tcl8} {UtfToUtfProc utf-8} {
+test encoding-24.4.tcl8 {UtfToUtfProc utf-8} {
     encoding convertfrom -profile tcl8 utf-8 \xC0\x80
 } \x00
 test encoding-24.5 {Parse valid or invalid utf-8} {
@@ -791,14 +790,20 @@ test encoding-24.11 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom -profile tcl8 utf-8 "\xEF\xBF\xBF"]
 } 1
 test encoding-24.12 {Parse invalid utf-8} -body {
+    encoding convertfrom -profile tcl8 utf-8 "\xC0\x81"
+} -result \xC0\x81
+test encoding-24.12.1 {Parse invalid utf-8} -body {
     encoding convertfrom -profile strict utf-8 "\xC0\x81"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
 test encoding-24.13 {Parse invalid utf-8} -body {
+    encoding convertfrom -profile tcl8 utf-8 "\xC1\xBF"
+} -result \xC1\xBF
+test encoding-24.13.1 {Parse invalid utf-8} -body {
     encoding convertfrom -profile strict utf-8 "\xC1\xBF"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC1'}
 test encoding-24.14 {Parse valid utf-8} {
-    expr {[encoding convertfrom utf-8 "\xC2\x80"] eq "\u80"}
-} 1
+    encoding convertfrom utf-8 "\xC2\x80"
+} \x80
 test encoding-24.15.strict {Parse invalid utf-8, -profile strict} -body {
     encoding convertfrom -profile strict utf-8 "Z\xE0\x80"
 } -returnCodes 1 -result "unexpected byte sequence starting at index 1: '\\xE0'"