summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-10-27 12:23:28 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-10-27 12:23:28 (GMT)
commit4ab9cb54181038d61f85f76f76a7b23e7a7c59ca (patch)
treea950b51bfaf0c4ca890fbe5757920ba85205a5c9
parentf18d453679d9b42aaca721479cff7d92205796af (diff)
downloadtcl-4ab9cb54181038d61f85f76f76a7b23e7a7c59ca.zip
tcl-4ab9cb54181038d61f85f76f76a7b23e7a7c59ca.tar.gz
tcl-4ab9cb54181038d61f85f76f76a7b23e7a7c59ca.tar.bz2
Update tests that were still written on the outdated premise that Tcl's
encoding subsystem had to initialize starting in the identity encoding.
-rw-r--r--tests/cmdAH.test8
-rw-r--r--tests/encoding.test8
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 4ca90c6..45a867a 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -145,7 +145,7 @@ test cmdAH-4.5 {Tcl_EncodingObjCmd} {
} 8C
test cmdAH-4.6 {Tcl_EncodingObjCmd} {
set system [encoding system]
- encoding system identity
+ encoding system iso8859-1
set x [encoding convertto jis0208 \u4e4e]
encoding system $system
set x
@@ -165,7 +165,7 @@ test cmdAH-4.9 {Tcl_EncodingObjCmd} {
} \u4e4e
test cmdAH-4.10 {Tcl_EncodingObjCmd} {
set system [encoding system]
- encoding system identity
+ encoding system iso8859-1
set x [encoding convertfrom jis0208 8C]
encoding system $system
set x
@@ -178,11 +178,11 @@ test cmdAH-4.12 {Tcl_EncodingObjCmd} {
} {1 {wrong # args: should be "encoding system ?encoding?"}}
test cmdAH-4.13 {Tcl_EncodingObjCmd} {
set system [encoding system]
- encoding system identity
+ encoding system iso8859-1
set x [encoding system]
encoding system $system
set x
-} identity
+} iso8859-1
test cmdAH-5.1 {Tcl_FileObjCmd} {
list [catch file msg] $msg
diff --git a/tests/encoding.test b/tests/encoding.test
index 85deb33..498e176 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -66,10 +66,10 @@ test encoding-2.2 {Tcl_FreeEncoding: refcount != 0} {testencoding} {
encoding system shiftjis ;# incr ref count
encoding dirs [list [pwd]]
set x [encoding convertto shiftjis \u4e4e] ;# old one found
- encoding system identity
+ encoding system iso8859-1
llength shiftjis
lappend x [catch {encoding convertto shiftjis \u4e4e} msg] $msg
- encoding system identity
+ encoding system iso8859-1
encoding dirs $path
encoding system $system
set x
@@ -121,7 +121,7 @@ test encoding-5.1 {Tcl_SetSystemEncoding} {
set old [encoding system]
encoding system jis0208
set x [encoding convertto \u4e4e]
- encoding system identity
+ encoding system iso8859-1
encoding system $old
set x
} {8C}
@@ -245,7 +245,7 @@ test encoding-11.5.1 {LoadEncodingFile: escape file} {
test encoding-11.6 {LoadEncodingFile: invalid file} {testencoding} {
set system [encoding system]
set path [encoding dirs]
- encoding system identity
+ encoding system iso8859-1
cd [temporaryDirectory]
encoding dirs [file join tmp encoding]
makeDirectory tmp