1 files changed, 65 insertions, 32 deletions
diff --git a/tests/utf.test b/tests/utf.test
index 5e78666..a9485a8 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -319,39 +319,72 @@ test utf-24.4 {unicode space char in regc_locale.c} {
 
 testConstraint teststringobj [llength [info commands teststringobj]]
 
-test utf-25.1 {Tcl_UniCharNcasecmp} teststringobj {
-    testobj freeallvars
-    teststringobj set 1 a
-    teststringobj set 2 b
-    teststringobj getunicode 1
-    teststringobj getunicode 2
-    string compare -nocase [teststringobj get 1] [teststringobj get 2]
-} -1
-test utf-25.2 {Tcl_UniCharNcasecmp} teststringobj {
-    testobj freeallvars
-    teststringobj set 1 b
-    teststringobj set 2 a
-    teststringobj getunicode 1
-    teststringobj getunicode 2
-    string compare -nocase [teststringobj get 1] [teststringobj get 2]
-} 1
-test utf-25.3 {Tcl_UniCharNcasecmp} teststringobj {
-    testobj freeallvars
-    teststringobj set 1 B
-    teststringobj set 2 a
-    teststringobj getunicode 1
-    teststringobj getunicode 2
-    string compare -nocase [teststringobj get 1] [teststringobj get 2]
-} 1
-test utf-25.4 {Tcl_UniCharNcasecmp} teststringobj {
-    testobj freeallvars
-    teststringobj set 1 aBcB
-    teststringobj set 2 abca
-    teststringobj getunicode 1
-    teststringobj getunicode 2
-    string compare -nocase [teststringobj get 1] [teststringobj get 2]
-} 1
+test utf-25.1 {Tcl_UniCharNcasecmp} -constraints teststringobj \
+    -setup {
+	testobj freeallvars
+    } \
+    -body {
+	teststringobj set 1 a
+	teststringobj set 2 b
+	teststringobj getunicode 1
+	teststringobj getunicode 2
+	string compare -nocase [teststringobj get 1] [teststringobj get 2]
+    } \
+    -cleanup {
+	testobj freeallvars
+    } \
+    -result -1
+test utf-25.2 {Tcl_UniCharNcasecmp} -constraints teststringobj \
+    -setup {
+	testobj freeallvars
+    } \
+    -body {
+	teststringobj set 1 b
+	teststringobj set 2 a
+	teststringobj getunicode 1
+	teststringobj getunicode 2
+	string compare -nocase [teststringobj get 1] [teststringobj get 2]
+    } \
+    -cleanup {
+	testobj freeallvars
+    } \
+    -result 1
+test utf-25.3 {Tcl_UniCharNcasecmp} -constraints teststringobj \
+    -setup {
+	testobj freeallvars
+    } \
+    -body {
+	teststringobj set 1 B
+	teststringobj set 2 a
+	teststringobj getunicode 1
+	teststringobj getunicode 2
+	string compare -nocase [teststringobj get 1] [teststringobj get 2]
+    } \
+    -cleanup {
+	testobj freeallvars
+    } \
+    -result 1
+
+test utf-25.4 {Tcl_UniCharNcasecmp} -constraints teststringobj \
+    -setup {
+	testobj freeallvars
+    } \
+    -body {
+	teststringobj set 1 aBcB
+	teststringobj set 2 abca
+	teststringobj getunicode 1
+	teststringobj getunicode 2
+	string compare -nocase [teststringobj get 1] [teststringobj get 2]
+    } \
+    -cleanup {
+	testobj freeallvars
+    } \
+    -result 1
 
 # cleanup
 ::tcltest::cleanupTests
 return
+
+# Local Variables:
+# mode: tcl
+# End: