summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-07-04 14:52:30 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-07-04 14:52:30 (GMT)
commit6bf04853ecf35bd3d5b034fd47b57e31d1d7a754 (patch)
tree3eb4dd92dc517b934ed375eefde661c516c01c65 /tests
parenta2c7cc0d23840242eae5fa78dabf9ca1b8dfb28a (diff)
downloadtcl-6bf04853ecf35bd3d5b034fd47b57e31d1d7a754.zip
tcl-6bf04853ecf35bd3d5b034fd47b57e31d1d7a754.tar.gz
tcl-6bf04853ecf35bd3d5b034fd47b57e31d1d7a754.tar.bz2
Use more uppercase hex in documentation and test-cases (for consistancy)
Diffstat (limited to 'tests')
-rw-r--r--tests/binary.test4
-rw-r--r--tests/encoding.test70
-rw-r--r--tests/encodingVectors.tcl18
-rw-r--r--tests/winConsole.test2
-rw-r--r--tests/winDde.test94
5 files changed, 88 insertions, 100 deletions
diff --git a/tests/binary.test b/tests/binary.test
index c51d0e9..2782a9d 100644
--- a/tests/binary.test
+++ b/tests/binary.test
@@ -2014,10 +2014,10 @@ test binary-53.19 {Tcl_BinaryObjCmd: format} {} {
} \xCD\xCC\xCC\x3F
test binary-53.20 {Tcl_BinaryObjCmd: float Inf} {} {
binary format R Inf
-} \x7f\x80\x00\x00
+} \x7F\x80\x00\x00
test binary-53.21 {Tcl_BinaryObjCmd: float Inf} {} {
binary format r Inf
-} \x00\x00\x80\x7f
+} \x00\x00\x80\x7F
test binary-53.22 {Binary float Inf round trip} -body {
binary scan [binary format R Inf] R inf
binary scan [binary format R -Inf] R inf_
diff --git a/tests/encoding.test b/tests/encoding.test
index 8167357..0d56a0b 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -231,18 +231,6 @@ test encoding-10.1 {Tcl_UtfToExternal} {
return $x
} "ab\x8C\xC1g"
-proc viewable {str} {
- set res ""
- foreach c [split $str {}] {
- if {[string is print $c] && [string is ascii $c]} {
- append res $c
- } else {
- append res "\\u[format %4.4X [scan $c %c]]"
- }
- }
- return "$str ($res)"
-}
-
test encoding-11.1 {LoadEncodingFile: unknown encoding} {testencoding} {
set system [encoding system]
set path [encoding dirs]
@@ -264,11 +252,11 @@ test encoding-11.4 {LoadEncodingFile: multi-byte} {
encoding convertfrom shiftjis \x8C\xC1
} 乎
test encoding-11.5 {LoadEncodingFile: escape file} {
- viewable [encoding convertto iso2022 乎]
-} [viewable "\x1B\$B8C\x1B(B"]
+ encoding convertto iso2022 乎
+} \x1B\$B8C\x1B(B
test encoding-11.5.1 {LoadEncodingFile: escape file} {
- viewable [encoding convertto iso2022-jp 乎]
-} [viewable "\x1B\$B8C\x1B(B"]
+ encoding convertto iso2022-jp 乎
+} \x1B\$B8C\x1B(B
test encoding-11.6 {LoadEncodingFile: invalid file} -constraints {testencoding} -setup {
set system [encoding system]
set path [encoding dirs]
@@ -292,17 +280,17 @@ test encoding-11.6 {LoadEncodingFile: invalid file} -constraints {testencoding}
encoding system $system
} -result {invalid encoding file "splat"}
test encoding-11.8 {encoding: extended Unicode UTF-16} {
- viewable [encoding convertto utf-16le 😹]
-} {=Ø9Þ (=\u00D89\u00DE)}
+ encoding convertto utf-16le 😹
+} =Ø9Þ
test encoding-11.9 {encoding: extended Unicode UTF-16} {
- viewable [encoding convertto utf-16be 😹]
-} {Ø=Þ9 (\u00D8=\u00DE9)}
+ encoding convertto utf-16be 😹
+} Ø=Þ9
test encoding-11.10 {encoding: extended Unicode UTF-32} {
- viewable [encoding convertto utf-32le 😹]
-} "9\xF6\x01\x00 (9\\u00F6\\u0001\\u0000)"
+ encoding convertto utf-32le 😹
+} 9\xF6\x01\x00
test encoding-11.11 {encoding: extended Unicode UTF-32} {
- viewable [encoding convertto utf-32be 😹]
-} "\x00\x01\xF69 (\\u0000\\u0001\\u00F69)"
+ encoding convertto utf-32be 😹
+} \x00\x01\xF69
# OpenEncodingFile is fully tested by the rest of the tests in this file.
test encoding-12.1 {LoadTableEncoding: normal encoding} {
@@ -329,8 +317,8 @@ test encoding-12.5 {LoadTableEncoding: symbol encoding} {
} "ggγ"
test encoding-13.1 {LoadEscapeTable} {
- viewable [set x [encoding convertto iso2022 ab乎棙g]]
-} [viewable "ab\x1B\$B8C\x1B\$\(DD%\x1B(Bg"]
+ encoding convertto iso2022 ab乎棙g
+} ab\x1B\$B8C\x1B\$\(DD%\x1B(Bg
test encoding-15.1 {UtfToUtfProc} {
encoding convertto utf-8 £
@@ -740,14 +728,14 @@ test encoding-24.1 {EscapeFreeProc on open channels} exec {
} {}
test encoding-24.2 {EscapeFreeProc on open channels} {exec} {
# Bug #524674 output
- viewable [runInSubprocess {
+ runInSubprocess {
encoding system cp1252; # Bug #2891556 crash revelator
fconfigure stdout -encoding iso2022-jp
puts ab乎棙g
set env(TCL_FINALIZE_ON_EXIT) 1
exit
- }]
-} "ab\x1B\$B8C\x1B\$(DD%\x1B(Bg (ab\\u001B\$B8C\\u001B\$(DD%\\u001B(Bg)"
+ }
+} "ab\x1B\$B8C\x1B\$(DD%\x1B(Bg"
test encoding-24.3 {EscapeFreeProc on open channels} {stdio} {
# Bug #219314 - if we don't free escape encodings correctly on channel
# closure, we go boom
@@ -761,8 +749,8 @@ test encoding-24.3 {EscapeFreeProc on open channels} {stdio} {
set count [gets $f line]
close $f
removeFile iso2022.tcl
- list $count [viewable $line]
-} [list 3 "乎乞也 (\\u4E4E\\u4E5E\\u4E5F)"]
+ 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"]
@@ -1061,30 +1049,30 @@ runtests
test encoding-bug-183a1adcc0-1 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
testencoding
} -body {
- # Note - buffers are initialized to \xff
+ # Note - buffers are initialized to \xFF
list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 1} result] $result
-} -result [list 0 [list nospace {} \xff]]
+} -result [list 0 [list nospace {} \xFF]]
test encoding-bug-183a1adcc0-2 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
testencoding
} -body {
- # Note - buffers are initialized to \xff
+ # Note - buffers are initialized to \xFF
list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 0} result] $result
} -result [list 0 [list nospace {} {}]]
test encoding-bug-183a1adcc0-3 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
testencoding
} -body {
- # Note - buffers are initialized to \xff
+ # Note - buffers are initialized to \xFF
list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 2} result] $result
} -result [list 0 [list nospace {} \x00\x00]]
test encoding-bug-183a1adcc0-4 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
testencoding
} -body {
- # Note - buffers are initialized to \xff
+ # Note - buffers are initialized to \xFF
list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 3} result] $result
-} -result [list 0 [list nospace {} \x00\x00\xff]]
+} -result [list 0 [list nospace {} \x00\x00\xFF]]
test encoding-bug-183a1adcc0-5 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
testencoding ucs2 knownBug
@@ -1092,7 +1080,7 @@ test encoding-bug-183a1adcc0-5 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExtern
# The knownBug constraint is because test depends on TCL_UTF_MAX and
# also UtfToUtf16 assumes space required in destination buffer is
# sizeof(Tcl_UniChar) which is incorrect when TCL_UTF_MAX==4
- # Note - buffers are initialized to \xff
+ # Note - buffers are initialized to \xFF
list [catch {testencoding Tcl_UtfToExternal utf-16 A {start end} {} 4} result] $result
} -result [list 0 [list ok {} [expr {$::tcl_platform(byteOrder) eq "littleEndian" ? "\x41\x00" : "\x00\x41"}]\x00\x00]]
@@ -1110,13 +1098,13 @@ test encoding-29.0 {get encoding nul terminator lengths} -constraints {
} -result {1 2 4 2 2}
test encoding-bug-6a3e2cb0f0-1 {Bug [6a3e2cb0f0] - invalid bytes in escape encodings} -body {
- encoding convertfrom -profile tcl8 iso2022-jp x\x1b\x7aaby
+ encoding convertfrom -profile tcl8 iso2022-jp x\x1B\x7Aaby
} -result x\uFFFDy
test encoding-bug-6a3e2cb0f0-2 {Bug [6a3e2cb0f0] - invalid bytes in escape encodings} -body {
- encoding convertfrom -profile strict iso2022-jp x\x1b\x7aaby
+ encoding convertfrom -profile strict iso2022-jp x\x1B\x7Aaby
} -returnCodes error -result {unexpected byte sequence starting at index 1: '\x1B'}
test encoding-bug-6a3e2cb0f0-3 {Bug [6a3e2cb0f0] - invalid bytes in escape encodings} -body {
- encoding convertfrom -profile replace iso2022-jp x\x1b\x7aaby
+ encoding convertfrom -profile replace iso2022-jp x\x1B\x7Aaby
} -result x\uFFFDy
test encoding-bug-66ffafd309-1-tcl8 {Bug [66ffafd309] - truncated DBCS} -body {
diff --git a/tests/encodingVectors.tcl b/tests/encodingVectors.tcl
index 986e221..3961917 100644
--- a/tests/encodingVectors.tcl
+++ b/tests/encodingVectors.tcl
@@ -32,7 +32,7 @@ set encValidStrings {}; # Reset the table
lappend encValidStrings {*}{
ascii \u0000 00 {} {Lowest ASCII}
- ascii \u007F 7F knownBug {Highest ASCII}
+ ascii \u007F 7F {} {Highest ASCII}
ascii \u007D 7D {} {Brace - just to verify test scripts are escaped correctly}
ascii \u007B 7B {} {Terminating brace - just to verify test scripts are escaped correctly}
@@ -593,11 +593,11 @@ lappend encInvalidBytes {*}{
utf-32le 00D8000000DC0000 tcl8 \uD800\uDC00 -1 {} {High-low-surrogate-pair}
utf-32le 00D8000000DC0000 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
utf-32le 00D8000000DC0000 strict {} 0 {} {High-low-surrogate-pair}
- utf-32le 00001100 tcl8 \UFFFD -1 {} {Out of range}
- utf-32le 00001100 replace \UFFFD -1 {} {Out of range}
+ utf-32le 00001100 tcl8 \uFFFD -1 {} {Out of range}
+ utf-32le 00001100 replace \uFFFD -1 {} {Out of range}
utf-32le 00001100 strict {} 0 {} {Out of range}
- utf-32le FFFFFFFF tcl8 \UFFFD -1 {} {Out of range}
- utf-32le FFFFFFFF replace \UFFFD -1 {} {Out of range}
+ utf-32le FFFFFFFF tcl8 \uFFFD -1 {} {Out of range}
+ utf-32le FFFFFFFF replace \uFFFD -1 {} {Out of range}
utf-32le FFFFFFFF strict {} 0 {} {Out of range}
utf-32be 41 tcl8 \uFFFD -1 {solo tail} {Truncated}
@@ -618,11 +618,11 @@ lappend encInvalidBytes {*}{
utf-32be 0000D8000000DC00 tcl8 \uD800\uDC00 -1 {} {High-low-surrogate-pair}
utf-32be 0000D8000000DC00 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
utf-32be 0000D8000000DC00 strict {} 0 {} {High-low-surrogate-pair}
- utf-32be 00110000 tcl8 \UFFFD -1 {} {Out of range}
- utf-32be 00110000 replace \UFFFD -1 {} {Out of range}
+ utf-32be 00110000 tcl8 \uFFFD -1 {} {Out of range}
+ utf-32be 00110000 replace \uFFFD -1 {} {Out of range}
utf-32be 00110000 strict {} 0 {} {Out of range}
- utf-32be FFFFFFFF tcl8 \UFFFD -1 {} {Out of range}
- utf-32be FFFFFFFF replace \UFFFD -1 {} {Out of range}
+ utf-32be FFFFFFFF tcl8 \uFFFD -1 {} {Out of range}
+ utf-32be FFFFFFFF replace \uFFFD -1 {} {Out of range}
utf-32be FFFFFFFF strict {} 0 {} {Out of range}
}
diff --git a/tests/winConsole.test b/tests/winConsole.test
index f030444..3f23c07 100644
--- a/tests/winConsole.test
+++ b/tests/winConsole.test
@@ -218,7 +218,7 @@ test console-fconfigure-get-1.[incr testnum] {
Console get stdin option -eofchar
} -constraints {win interactive} -body {
fconfigure stdin -eofchar
-} -result \x1a
+} -result \x1A
test console-fconfigure-get-1.[incr testnum] {
fconfigure -winsize
diff --git a/tests/winDde.test b/tests/winDde.test
index 93b9242..8f4da11 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -130,104 +130,104 @@ test winDde-2.4 {Checking for existence, with only the topic specified} \
# -------------------------------------------------------------------------
test winDde-3.1 {DDE execute locally} -constraints dde -body {
- set \xe1 ""
- dde execute TclEval self [list set \xe1 foo]
- set \xe1
+ set \xE1 ""
+ dde execute TclEval self [list set \xE1 foo]
+ set \xE1
} -result foo
test winDde-3.2 {DDE execute -async locally} -constraints dde -body {
- set \xe1 ""
- dde execute -async TclEval self [list set \xe1 foo]
+ set \xE1 ""
+ dde execute -async TclEval self [list set \xE1 foo]
update
- set \xe1
+ set \xE1
} -result foo
test winDde-3.3 {DDE request locally} -constraints dde -body {
- set \xe1 ""
- dde execute TclEval self [list set \xe1 foo]
- dde request TclEval self \xe1
+ set \xE1 ""
+ dde execute TclEval self [list set \xE1 foo]
+ dde request TclEval self \xE1
} -result foo
test winDde-3.4 {DDE eval locally} -constraints dde -body {
- set \xe1 ""
- dde eval self set \xe1 foo
+ set \xE1 ""
+ dde eval self set \xE1 foo
} -result foo
test winDde-3.5 {DDE request locally} -constraints dde -body {
- set \xe1 ""
- dde execute TclEval self [list set \xe1 foo]
- dde request -binary TclEval self \xe1
+ set \xE1 ""
+ dde execute TclEval self [list set \xE1 foo]
+ dde request -binary TclEval self \xE1
} -result "foo\x00"
# Set variable a to A with diaeresis (Unicode C4) by relying on the fact
# that utf-8 is sent (e.g. "c3 84" on the wire)
test winDde-3.6 {DDE request utf-8} -constraints dde -body {
- set \xe1 "not set"
- dde execute TclEval self "set \xe1 \xc4"
- scan [set \xe1] %c
+ set \xE1 "not set"
+ dde execute TclEval self "set \xE1 \xC4"
+ scan [set \xE1] %c
} -result 196
# Set variable a to A with diaeresis (Unicode C4) using binary execute
# and compose utf-8 (e.g. "c3 84" ) manually
test winDde-3.7 {DDE request binary} -constraints {dde notWine} -body {
- set \xe1 "not set"
- dde execute -binary TclEval self [list set \xc3\xa1 \xc3\x84\x00]
- scan [set \xe1] %c
+ set \xE1 "not set"
+ dde execute -binary TclEval self [list set \xC3\xA1 \xC3\x84\x00]
+ scan [set \xE1] %c
} -result 196
test winDde-3.8 {DDE poke locally} -constraints {dde debug} -body {
- set \xe1 ""
- dde poke TclEval self \xe1 \xc4
- dde request TclEval self \xe1
-} -result \xc4
+ set \xE1 ""
+ dde poke TclEval self \xE1 \xC4
+ dde request TclEval self \xE1
+} -result \xC4
test winDde-3.9 {DDE poke -binary locally} -constraints {dde debug} -body {
- set \xe1 ""
- dde poke -binary TclEval self \xe1 \xc3\x84\x00
- dde request TclEval self \xe1
-} -result \xc4
+ set \xE1 ""
+ dde poke -binary TclEval self \xE1 \xC3\x84\x00
+ dde request TclEval self \xE1
+} -result \xC4
# -------------------------------------------------------------------------
test winDde-4.1 {DDE execute remotely} -constraints {dde stdio} -body {
- set \xe1 ""
+ set \xE1 ""
set name ch\xEDld-4.1
set child [createChildProcess $name]
- dde execute TclEval $name [list set \xe1 foo]
+ dde execute TclEval $name [list set \xE1 foo]
dde execute TclEval $name {set done 1}
update
- set \xe1
+ set \xE1
} -result ""
test winDde-4.2 {DDE execute async remotely} -constraints {dde stdio} -body {
- set \xe1 ""
+ set \xE1 ""
set name ch\xEDld-4.2
set child [createChildProcess $name]
- dde execute -async TclEval $name [list set \xe1 foo]
+ dde execute -async TclEval $name [list set \xE1 foo]
update
dde execute TclEval $name {set done 1}
update
- set \xe1
+ set \xE1
} -result ""
test winDde-4.3 {DDE request remotely} -constraints {dde stdio} -body {
- set \xe1 ""
+ set \xE1 ""
set name ch\xEDld-4.3
set child [createChildProcess $name]
- dde execute TclEval $name [list set \xe1 foo]
- set \xe1 [dde request TclEval $name \xe1]
+ dde execute TclEval $name [list set \xE1 foo]
+ set \xE1 [dde request TclEval $name \xE1]
dde execute TclEval $name {set done 1}
update
- set \xe1
+ set \xE1
} -result foo
test winDde-4.4 {DDE eval remotely} -constraints {dde stdio} -body {
- set \xe1 ""
+ set \xE1 ""
set name ch\xEDld-4.4
set child [createChildProcess $name]
- set \xe1 [dde eval $name set \xe1 foo]
+ set \xE1 [dde eval $name set \xE1 foo]
dde execute TclEval $name {set done 1}
update
- set \xe1
+ set \xE1
} -result foo
test winDde-4.5 {DDE poke remotely} -constraints {dde debug stdio} -body {
- set \xe1 ""
+ set \xE1 ""
set name ch\xEDld-4.5
set child [createChildProcess $name]
- dde poke TclEval $name \xe1 foo
- set \xe1 [dde request TclEval $name \xe1]
+ dde poke TclEval $name \xE1 foo
+ set \xE1 [dde request TclEval $name \xE1]
dde execute TclEval $name {set done 1}
update
- set \xe1
+ set \xE1
} -result foo
# -------------------------------------------------------------------------
@@ -402,8 +402,8 @@ test winDde-8.9 {Safe DDE check command evaluation} -constraints dde -setup {
child eval {proc DDEACCEPT {cmd} {set ::DDECMD [uplevel \#0 $cmd]}}
child invokehidden dde servername -handler DDEACCEPT child
} -body {
- dde eval child set \xe1 1
- child eval set \xe1
+ dde eval child set \xE1 1
+ child eval set \xE1
} -cleanup {interp delete child} -result 1
test winDde-8.10 {Safe DDE check command evaluation (2)} -constraints dde -setup {
interp create -safe child