summaryrefslogtreecommitdiffstats
path: root/tests/scrollbar.test
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-10-08 18:57:47 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-10-08 18:57:47 (GMT)
commit6fb3a6d3efe6a53910a30154df8efadf64546cdc (patch)
treec53e665efd2a5d3a8132b83073506d76dfbe79eb /tests/scrollbar.test
parent825b7d492bfa734ee85d7a0e39a3cd1540da3d5a (diff)
downloadtk-6fb3a6d3efe6a53910a30154df8efadf64546cdc.zip
tk-6fb3a6d3efe6a53910a30154df8efadf64546cdc.tar.gz
tk-6fb3a6d3efe6a53910a30154df8efadf64546cdc.tar.bz2
* tests/scrollbar.test: Revised testing of the cget subcommand so
that it tests consistency with the configure subcommand and not agreement with a hardcoded value that will change as tastes in GUIs evolve. * unix/tkUnixWm.c: Restored consistency of error messages from * macosx/tkMacOSXWm.c: [wm iconphoto] with the test suite and across * tests/unixWm.test: all platforms. [Bug 2021443]
Diffstat (limited to 'tests/scrollbar.test')
-rw-r--r--tests/scrollbar.test38
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 33fd592..1ba79db 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -7,7 +7,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: scrollbar.test,v 1.22 2008/10/06 23:42:58 patthoyts Exp $
+# RCS: @(#) $Id: scrollbar.test,v 1.23 2008/10/08 18:57:47 dgp Exp $
package require tcltest 2.1
eval tcltest::configure $argv
@@ -163,24 +163,24 @@ test scrollbar-3.10 {ScrollbarWidgetCmd procedure, "cget" option} {
list [catch {.s cget -orient} msg] $msg
} {0 vertical}
scrollbar .s2
-test scrollbar-3.11 {ScrollbarWidgetCmd procedure, "cget" option} win {
- list [catch {.s2 cget -bd} msg] $msg
-} {0 0}
-test scrollbar-3.12 {ScrollbarWidgetCmd procedure, "cget" option} {unix notAqua} {
- list [catch {.s2 cget -bd} msg] $msg
-} {0 2}
-test scrollbar-3.12.1 {ScrollbarWidgetCmd procedure, "cget" option} aqua {
- list [catch {.s2 cget -bd} msg] $msg
-} {0 0}
-test scrollbar-3.13 {ScrollbarWidgetCmd procedure, "cget" option} win {
- list [catch {.s2 cget -highlightthickness} msg] $msg
-} {0 0}
-test scrollbar-3.14 {ScrollbarWidgetCmd procedure, "cget" option} {unix notAqua} {
- list [catch {.s2 cget -highlightthickness} msg] $msg
-} {0 0}
-test scrollbar-3.14.1 {ScrollbarWidgetCmd procedure, "cget" option} aqua {
- list [catch {.s2 cget -highlightthickness} msg] $msg
-} {0 0}
+test scrollbar-3.11 {ScrollbarWidgetCmd procedure, "cget" option} {
+ expr {[.s2 cget -bd] == [lindex [.s2 configure -bd] 3]}
+} 1
+test scrollbar-3.12 {ScrollbarWidgetCmd procedure, "cget" option} emptyTest {
+ # empty test; duplicated scrollbar-3.11
+} {}
+test scrollbar-3.12.1 {ScrollbarWidgetCmd procedure, "cget" option} emptyTest {
+ # empty test; duplicated scrollbar-3.11
+} {}
+test scrollbar-3.13 {ScrollbarWidgetCmd procedure, "cget" option} {
+ expr {[.s2 cget -highlightthickness] == [lindex [.s2 configure -highlightthickness] 3]}
+} 1
+test scrollbar-3.14 {ScrollbarWidgetCmd procedure, "cget" option} emptyTest {
+ # empty test; duplicated scrollbar-3.13
+} {}
+test scrollbar-3.14.1 {ScrollbarWidgetCmd procedure, "cget" option} emptyTest {
+ # empty test; duplicated scrollbar-3.13
+} {}
destroy .s2
test scrollbar-3.15 {ScrollbarWidgetCmd procedure, "configure" option} {
llength [.s configure]