test-case cleanup

1 files changed, 76 insertions, 45 deletions

diff --git a/tests/encoding.test b/tests/encoding.test
index da2dac3..76b5306 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -334,7 +334,7 @@ test encoding-15.3 {UtfToUtfProc null character input} teststringbytes {
 } c080
 test encoding-15.4 {UtfToUtfProc emoji character input} -body {
     set x \xED\xA0\xBD\xED\xB8\x82
-    set y [encoding convertfrom utf-8 \xED\xA0\xBD\xED\xB8\x82]
+    set y [encoding convertfrom -profile tcl8 utf-8 \xED\xA0\xBD\xED\xB8\x82]
     list [string length $x] $y
 } -result "6 😂"
 test encoding-15.5 {UtfToUtfProc emoji character input} {
@@ -452,7 +452,7 @@ test encoding-15.25 {UtfToUtfProc CESU-8} {
     encoding convertfrom cesu-8 \x00
 } \x00
 test encoding-15.26 {UtfToUtfProc CESU-8} {
-    encoding convertfrom cesu-8 \xC0\x80
+    encoding convertfrom -profile tcl8 cesu-8 \xC0\x80
 } \x00
 test encoding-15.27 {UtfToUtfProc -profile strict CESU-8} {
     encoding convertfrom -profile strict cesu-8 \x00
@@ -479,7 +479,7 @@ test encoding-16.2 {Utf16ToUtfProc} -body {
     list $val [format %x [scan $val %c]]
 } -result "\U460DC 460dc"
 test encoding-16.3 {Utf16ToUtfProc} -body {
-    set val [encoding convertfrom utf-16 "\xDC\xDC"]
+    set val [encoding convertfrom -profile tcl8 utf-16 "\xDC\xDC"]
     list $val [format %x [scan $val %c]]
 } -result "\uDCDC dcdc"
 test encoding-16.4 {Ucs2ToUtfProc} -body {
@@ -503,28 +503,28 @@ test encoding-16.8 {Utf32ToUtfProc} -body {
     list $val [format %x [scan $val %c]]
 } -result "\uFFFD fffd"
 test encoding-16.9 {Utf32ToUtfProc} -body {
-    encoding convertfrom utf-32le \x00\xD8\x00\x00
+    encoding convertfrom -profile tcl8 utf-32le \x00\xD8\x00\x00
 } -result \uD800
 test encoding-16.10 {Utf32ToUtfProc} -body {
-    encoding convertfrom utf-32le \x00\xDC\x00\x00
+    encoding convertfrom -profile tcl8 utf-32le \x00\xDC\x00\x00
 } -result \uDC00
 test encoding-16.11 {Utf32ToUtfProc} -body {
-    encoding convertfrom utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00
+    encoding convertfrom -profile tcl8 utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00
 } -result \uD800\uDC00
 test encoding-16.12 {Utf32ToUtfProc} -body {
-    encoding convertfrom utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00
+    encoding convertfrom -profile tcl8 utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00
 } -result \uDC00\uD800
 test encoding-16.13 {Utf16ToUtfProc} -body {
-    encoding convertfrom utf-16le \x00\xD8
+    encoding convertfrom -profile tcl8 utf-16le \x00\xD8
 } -result \uD800
 test encoding-16.14 {Utf16ToUtfProc} -body {
-    encoding convertfrom utf-16le \x00\xDC
+    encoding convertfrom -profile tcl8 utf-16le \x00\xDC
 } -result \uDC00
 test encoding-16.15 {Utf16ToUtfProc} -body {
     encoding convertfrom utf-16le \x00\xD8\x00\xDC
 } -result \uD800\uDC00
 test encoding-16.16 {Utf16ToUtfProc} -body {
-    encoding convertfrom utf-16le \x00\xDC\x00\xD8
+    encoding convertfrom -profile tcl8 utf-16le \x00\xDC\x00\xD8
 } -result \uDC00\uD800
 test encoding-16.17 {Utf32ToUtfProc} -body {
     list [encoding convertfrom -profile strict -failindex  idx utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00] [set idx]
@@ -549,15 +549,24 @@ test encoding-16.18 {
 	return done
     } [namespace current]]
 } -result done
-test encoding-16.19 {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
-    encoding convertfrom utf-16 "\x41\x41\x41"
+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 {
+    encoding convertfrom -profile tcl8 utf-16 "\x41\x41\x41"
 } -result \u4141\uFFFD
-test encoding-16.20 {Utf16ToUtfProc, bug [d19fe0a5b]} -constraints deprecated -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.21 {Utf16ToUtfProc, bug [d19fe0a5b]} -body {
-    encoding convertfrom utf-32 "\x00\x00\x00\x00\x41\x41"
+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'}
@@ -565,10 +574,13 @@ test encoding-16.23 {Utf16ToUtfProc, strict, bug [db7a085bd9]} -body {
     encoding convertfrom -profile strict utf-16le \x00\xDC
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\x00'}
 test encoding-16.24 {Utf32ToUtfProc} -body {
-    encoding convertfrom utf-32 "\xFF\xFF\xFF\xFF"
+    encoding convertfrom -profile tcl8 utf-32 "\xFF\xFF\xFF\xFF"
 } -result \uFFFD
-test encoding-16.25 {Utf32ToUtfProc} -body {
-    encoding convertfrom utf-32 "\x01\x00\x00\x01"
+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 {
+    encoding convertfrom -profile tcl8 utf-32 "\x01\x00\x00\x01"
 } -result \uFFFD
 
 test encoding-17.1 {UtfToUtf16Proc} -body {
@@ -583,10 +595,10 @@ test encoding-17.3 {UtfToUtf16Proc} -body {
 test encoding-17.4 {UtfToUtf16Proc} -body {
     encoding convertto -profile tcl8 utf-16le "\uD8D8"
 } -result "\xD8\xD8"
-test encoding-17.5 {UtfToUtf16Proc} -body {
+test encoding-17.5 {UtfToUtf32Proc} -body {
     encoding convertto utf-32le "\U460DC"
 } -result "\xDC\x60\x04\x00"
-test encoding-17.6 {UtfToUtf16Proc} -body {
+test encoding-17.6 {UtfToUtf32Proc} -body {
     encoding convertto utf-32be "\U460DC"
 } -result "\x00\x04\x60\xDC"
 test encoding-17.7 {UtfToUtf16Proc} -body {
@@ -608,8 +620,8 @@ test encoding-17.12 {Utf32ToUtfProc} -body {
     encoding convertfrom -profile strict utf-32le "\x00\xDC\x00\x00"
 } -returnCodes error -result {unexpected byte sequence starting at index 0: '\x00'}
 
-test encoding-18.1 {TableToUtfProc on invalid input} -constraints deprecated -body {
-	list [catch {encoding convertto jis0208 \\} res] $res
+test encoding-18.1 {TableToUtfProc on invalid input} -body {
+	list [catch {encoding convertto -profile tcl8 jis0208 \\} res] $res
 } -result {0 !)}
 test encoding-18.2 {TableToUtfProc on invalid input with -profile strict} -body {
 	list [catch {encoding convertto -profile strict jis0208 \\} res] $res
@@ -621,14 +633,14 @@ test encoding-18.4 {TableToUtfProc on invalid input with -failindex -profile str
 	list [catch {encoding convertto -failindex pos -profile strict jis0208 \\} res] $res $pos
 } -result {0 {} 0}
 test encoding-18.5 {TableToUtfProc on invalid input with -failindex} -body {
-	list [catch {encoding convertto -failindex pos jis0208 \\} res] $res $pos
+	list [catch {encoding convertto -profile tcl8 -failindex pos jis0208 \\} res] $res $pos
 } -result {0 !) -1}
 test encoding-18.6 {TableToUtfProc on invalid input with -profile tcl8} -body {
 	list [catch {encoding convertto -profile tcl8 jis0208 \\} res] $res
 } -result {0 !)}
 
 test encoding-19.1 {TableFromUtfProc} -body {
-    encoding convertfrom ascii AÁ
+    encoding convertfrom -profile tcl8 ascii AÁ
 } -result AÁ
 test encoding-19.2 {TableFromUtfProc} -body {
     encoding convertfrom -profile tcl8 ascii AÁ
@@ -637,7 +649,7 @@ test encoding-19.3 {TableFromUtfProc} -body {
     encoding convertfrom -profile strict ascii AÁ
 } -returnCodes 1 -result {unexpected byte sequence starting at index 1: '\xC1'}
 test encoding-19.4 {TableFromUtfProc} -body {
-    list [encoding convertfrom -failindex idx ascii AÁ] [set idx]
+    list [encoding convertfrom -profile tcl8 -failindex idx ascii AÁ] [set idx]
 } -result [list A\xC1 -1]
 test encoding-19.5 {TableFromUtfProc} -body {
     list [encoding convertfrom -failindex idx -profile strict ascii A\xC1] [set idx]
@@ -752,9 +764,12 @@ test encoding-24.3 {EscapeFreeProc on open channels} {stdio} {
     list $count $line
 } [list 3 乎乞也]
 
-test encoding-24.4 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -profile tcl8 utf-8 "\xC0\x80"]
-} 1
+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.tcl8 {UtfToUtfProc utf-8} {
+    encoding convertfrom -profile tcl8 utf-8 \xC0\x80
+} \x00
 test encoding-24.5 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom -profile tcl8 utf-8 "\xC0\x81"]
 } 2
@@ -776,17 +791,26 @@ test encoding-24.10 {Parse valid or invalid utf-8} {
 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 valid or invalid utf-8} -constraints deprecated -body {
-    encoding convertfrom utf-8 "\xC0\x81"
+test encoding-24.12 {Parse invalid utf-8} -body {
+    encoding convertfrom -profile tcl8 utf-8 "\xC0\x81"
 } -result \xC0\x81
-test encoding-24.13 {Parse valid or invalid utf-8} -constraints deprecated -body {
-    encoding convertfrom utf-8 "\xC1\xBF"
+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.14 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xC2\x80"]
-} 1
-test encoding-24.15 {Parse valid or invalid utf-8} -constraints deprecated -body {
-    encoding convertfrom utf-8 "Z\xE0\x80"
+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} {
+    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'"
+test encoding-24.15.tcl8 {Parse invalid utf-8, -profile tcl8} -body {
+    encoding convertfrom -profile tcl8 utf-8 "Z\xE0\x80"
 } -result Z\xE0\u20AC
 test encoding-24.16 {Parse valid or invalid utf-8} -constraints testbytestring -body {
     encoding convertto utf-8 [testbytestring "Z\u4343\x80"]
@@ -797,9 +821,12 @@ test encoding-24.17 {Parse valid or invalid utf-8} -constraints testbytestring -
 test encoding-24.18 {Parse valid or invalid utf-8} -constraints testbytestring -body {
     encoding convertto utf-8 [testbytestring "Z\xE0\x80xxxxxx"]
 } -result "Z\xC3\xA0\xE2\x82\xACxxxxxx"
-test encoding-24.19 {Parse valid or invalid utf-8} -constraints deprecated -body {
-    encoding convertto utf-8 "ZX\uD800"
+test encoding-24.19.1 {Parse valid or invalid utf-8} -body {
+    encoding convertto -profile tcl8 utf-8 "ZX\uD800"
 } -result ZX\xED\xA0\x80
+test encoding-24.19.2 {Parse valid or invalid utf-8} -body {
+    encoding convertto -profile strict utf-8 "ZX\uD800"
+} -returnCodes 1 -match glob -result "unexpected character at index 2: 'U+00D800'"
 test encoding-24.20 {Parse with -profile tcl8 but without providing encoding} -body {
     encoding convertfrom -profile tcl8 "\x20"
 } -result {wrong # args: should be "::tcl::encoding::convertfrom ?-profile profile? ?-failindex var? encoding data" or "::tcl::encoding::convertfrom data"} -returnCodes error
@@ -839,14 +866,14 @@ test encoding-24.31 {Parse invalid utf-8 with -profile tcl8} -body {
 test encoding-24.32 {Try to generate invalid utf-8} -body {
     encoding convertto utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.33 {Try to generate noncharacter with -profile strict} -body {
+test encoding-24.33 {Try to generate invalid utf-8} -body {
     encoding convertto -profile strict utf-8 \uFFFF
 } -result \xEF\xBF\xBF
 test encoding-24.34 {Try to generate invalid utf-8 with -profile tcl8} -body {
     encoding convertto -profile tcl8 utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.35 {Parse invalid utf-8} -constraints deprecated -body {
-    encoding convertfrom utf-8 \xED\xA0\x80
+test encoding-24.35 {Parse invalid utf-8} -body {
+    encoding convertfrom -profile tcl8 utf-8 \xED\xA0\x80
 } -result \uD800
 test encoding-24.36 {Parse invalid utf-8 with -profile strict} -body {
     encoding convertfrom -profile strict utf-8 \xED\xA0\x80
@@ -854,9 +881,12 @@ test encoding-24.36 {Parse invalid utf-8 with -profile strict} -body {
 test encoding-24.37 {Parse invalid utf-8 with -profile tcl8} -body {
     encoding convertfrom -profile tcl8 utf-8 \xED\xA0\x80
 } -result \uD800
-test encoding-24.38 {Try to generate invalid utf-8} -constraints deprecated -body {
-    encoding convertto utf-8 \uD800
+test encoding-24.38.1 {Try to generate invalid utf-8} -body {
+    encoding convertto -profile tcl8 utf-8 \uD800
 } -result \xED\xA0\x80
+test encoding-24.38.2 {Try to generate invalid utf-8} -body {
+    encoding convertto -profile strict utf-8 \uD800
+} -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
 test encoding-24.39 {Try to generate invalid utf-8 with -profile strict} -body {
     encoding convertto -profile strict utf-8 \uD800
 } -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
@@ -1124,6 +1154,7 @@ test encoding-bug-66ffafd309-2-replace {Bug [66ffafd309] - invalid DBCS} -body {
     # Not truncated but invalid
     encoding convertfrom -profile replace jis0208 \x78\x79
 } -result \uFFFD\uFFFD
+
 # cleanup
 namespace delete ::tcl::test::encoding
 ::tcltest::cleanupTests