diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-08 15:19:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-08 15:19:43 (GMT) |
| commit | dc4018e40d89363bcceca8c6ef20fc315ac734d9 (patch) | |
| tree | 9ef0bded6ed11b50b26f73112b91a1a71a05045d /tests | |
| parent | 07e0e0d06a58acfb653f6f760c4a7f180c6ac456 (diff) | |
| parent | 752f99d5762c8c78c12d48f81c36d7f2a4914e37 (diff) | |
| download | tcl-dc4018e40d89363bcceca8c6ef20fc315ac734d9.zip tcl-dc4018e40d89363bcceca8c6ef20fc315ac734d9.tar.gz tcl-dc4018e40d89363bcceca8c6ef20fc315ac734d9.tar.bz2 | |
Rebase to latest core-8-6-branch.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/encoding.test | 7 | ||||
| -rw-r--r-- | tests/utf.test | 15 |
2 files changed, 9 insertions, 13 deletions
diff --git a/tests/encoding.test b/tests/encoding.test index 552c97f..84f9ae1 100644 --- a/tests/encoding.test +++ b/tests/encoding.test @@ -335,7 +335,12 @@ test encoding-15.4 {UtfToUtfProc emoji character input} -body { set y [encoding convertfrom utf-8 \xED\xA0\xBD\xED\xB8\x82] list [string length $x] $y } -result "6 \uD83D\uDE02" -test encoding-15.5 {UtfToUtfProc emoji character input} { +test encoding-15.5.0 {UtfToUtfProc emoji character input} ucs2 { + set x \xF0\x9F\x98\x82 + set y [encoding convertfrom utf-8 \xF0\x9F\x98\x82] + list [string length $x] $y +} "4 \xF0\x9F\x98\x82" +test encoding-15.5.1 {UtfToUtfProc emoji character input} fullutf { set x \xF0\x9F\x98\x82 set y [encoding convertfrom utf-8 \xF0\x9F\x98\x82] list [string length $x] $y diff --git a/tests/utf.test b/tests/utf.test index 7b5cbf6..1a4b157 100644 --- a/tests/utf.test +++ b/tests/utf.test @@ -219,12 +219,9 @@ test utf-6.8 {Tcl_UtfNext} {testutfnext testbytestring} { test utf-6.9.0 {Tcl_UtfNext} {testutfnext testbytestring ucs2} { testutfnext [testbytestring \xA0] } 1 -test utf-6.9.1 {Tcl_UtfNext} {testutfnext testbytestring utf16} { +test utf-6.9.1 {Tcl_UtfNext} {testutfnext testbytestring fullutf} { testutfnext [testbytestring \xA0] } -1 -test utf-6.9.2 {Tcl_UtfNext} {testutfnext testbytestring ucs4} { - testutfnext [testbytestring \xA0] -} 1 test utf-6.10 {Tcl_UtfNext} {testutfnext testbytestring} { testutfnext [testbytestring \xA0]G } 1 @@ -516,21 +513,15 @@ test utf-6.91.1 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext testbyte test utf-6.92.0 {Tcl_UtfNext, pointing to 2th byte of 4-byte valid sequence} {testutfnext testbytestring ucs2} { testutfnext [testbytestring \xA0\xA0\xA0] } 1 -test utf-6.92.1 {Tcl_UtfNext, pointing to 2th byte of 4-byte valid sequence} {testutfnext testbytestring utf16} { +test utf-6.92.1 {Tcl_UtfNext, pointing to 2th byte of 4-byte valid sequence} {testutfnext testbytestring fullutf} { testutfnext [testbytestring \xA0\xA0\xA0] } 3 -test utf-6.92.2 {Tcl_UtfNext, pointing to 2th byte of 4-byte valid sequence} {testutfnext testbytestring ucs4} { - testutfnext [testbytestring \xA0\xA0\xA0] -} 1 test utf-6.93.0 {Tcl_UtfNext, pointing to 2th byte of 4-byte invalid sequence} {testutfnext testbytestring ucs2} { testutfnext [testbytestring \x80\x80\x80] } 1 -test utf-6.93.1 {Tcl_UtfNext, pointing to 2th byte of 4-byte invalid sequence} {testutfnext testbytestring utf16} { +test utf-6.93.1 {Tcl_UtfNext, pointing to 2th byte of 4-byte invalid sequence} {testutfnext testbytestring fullutf} { testutfnext [testbytestring \x80\x80\x80] } 3 -test utf-6.93.2 {Tcl_UtfNext, pointing to 2th byte of 4-byte invalid sequence} {testutfnext testbytestring ucs4} { - testutfnext [testbytestring \x80\x80\x80] -} 1 test utf-6.94 {Tcl_UtfNext, pointing to 2th byte of 5-byte invalid sequence} {testutfnext testbytestring ucs2} { testutfnext [testbytestring \xA0\xA0\xA0\xA0] } 1 |