diff options
Diffstat (limited to 'itcl/iwidgets3.0.0/tests/tabset.test')
| -rw-r--r-- | itcl/iwidgets3.0.0/tests/tabset.test | 98 |
1 files changed, 59 insertions, 39 deletions
diff --git a/itcl/iwidgets3.0.0/tests/tabset.test b/itcl/iwidgets3.0.0/tests/tabset.test index 425bd324ef5..0731be492e5 100644 --- a/itcl/iwidgets3.0.0/tests/tabset.test +++ b/itcl/iwidgets3.0.0/tests/tabset.test @@ -13,6 +13,9 @@ # # @(#) $Id$ +package require tcltest +namespace import -force ::tcltest::* + package require Iwidgets 3.0 if {[string compare test [info procs test]] == 1} { @@ -237,9 +240,15 @@ foreach test { } { set method [lindex [lindex $test 0] 1] set method_invoke [lindex $test 0] - test_pattern Tabset-3.$m "\[$method_invoke\]" { - list [catch {eval [lindex $test 0]} msg] $msg - } [list 0 [lindex $test 1]] + + set testContents "set msg {}\n" + append testContents \ + "set result \[catch \{[lindex $test 0]\} msg\]\n" + append testContents \ + "lappend result \[regexp -- \{[lindex $test 1]\} \$msg\] \n" + append testContents "set result\n" + test Tabset-3.$m "\[$method_invoke\]" $testContents \ + [list 0 1] update incr m } @@ -247,44 +256,52 @@ foreach test { # # Method tests which fail and produce errors # +set m 1 foreach test { - {{.ts delete 0 end} {}} - {{.ts add} {}} - {{.ts delete 0} {}} - {{.ts delete 0} {can't delete tabs, no tabs}} - {{.ts add} {}} - {{.ts delete 1} {bad value for index1}} - {{.ts delete select} {bad value for index1}} - {{.ts delete 0} {}} - {{.ts add} {}} - {{.ts delete 0 1} {bad value for index2}} - {{.ts delete 1 4} {bad value for index1}} - {{.ts add} {}} - {{.ts delete 0 1} {}} - {{.ts add} {}} - {{.ts delete 0 1 4 5 6} {wrong # args}} - {{.ts delete} {wrong # args}} - {{.ts delete 0} {}} - {{.ts delete 0} {can't delete tabs}} - {{.ts delete select} {can't delete tabs}} - {{.ts insert 0} {no tab to insert before, tabset}} - {{.ts add} {}} - {{.ts add} {}} - {{.ts insert 2} {bad value}} - {{.ts insert -1} {bad option}} - {{.ts delete 0 end} {}} - {{.ts next} {can't goto next tab, no tabs in the tabset}} - {{.ts prev} {can't goto previous tab, no tabs in the tabset}} - {{.ts select 0} {can't activate a tab, no tabs in the tabset}} - {{.ts add} {}} - {{.ts select 1} {bad value}} - {{.ts delete 0} {}} + {1 {.ts delete 0 end} {can't delete tab}} + {0 {.ts add} {}} + {0 {.ts delete 0} {}} + {1 {.ts delete 0} {can't delete tabs, no tabs}} + {0 {.ts add} {}} + {1 {.ts delete 1} {bad value for index1}} + {1 {.ts delete select} {bad value for index1}} + {0 {.ts delete 0} {}} + {0 {.ts add} {}} + {1 {.ts delete 0 1} {bad value for index2}} + {1 {.ts delete 1 4} {bad value for index1}} + {0 {.ts add} {}} + {0 {.ts delete 0 1} {}} + {0 {.ts add} {}} + {1 {.ts delete 0 1 4 5 6} {wrong # args}} + {1 {.ts delete} {wrong # args}} + {0 {.ts delete 0} {}} + {1 {.ts delete 0} {can't delete tabs}} + {1 {.ts delete select} {can't delete tabs}} + {1 {.ts insert 0} {no tab to insert before, tabset}} + {0 {.ts add} {}} + {0 {.ts add} {}} + {1 {.ts insert 2} {bad value}} + {1 {.ts insert -1} {bad option}} + {0 {.ts delete 0 end} {}} + {1 {.ts next} {can't goto next tab, no tabs in the tabset}} + {1 {.ts prev} {can't goto previous tab, no tabs in the tabset}} + {1 {.ts select 0} {can't activate a tab, no tabs in the tabset}} + {0 {.ts add} {}} + {1 {.ts select 1} {bad value}} + {0 {.ts delete 0} {}} } { - set method [lindex [lindex $test 0] 1] - set method_invoke [lindex $test 0] - test_pattern Tabset-3.$m "\[$method_invoke\]" { - list [catch {eval [lindex $test 0]} msg] $msg - } [list 1 [lindex $test 1]] + set method_status [lindex $test 0] + set method_invoke [lindex $test 1] + set method [lindex $method_invoke 1] + + set testContents "set msg {}\n" + append testContents \ + "set result \[catch \{$method_invoke\} msg\]\n" + append testContents \ + "lappend result \[regexp -- \{[lindex $test 2]\} \$msg\] \n" + append testContents "set result\n" + test Tabset-4.$m "\[$method_invoke\]" $testContents \ + [list $method_status 1] incr m } @@ -315,3 +332,6 @@ test Tabset-1.$c {Tabset destruction} { destroy .ts update } {} + +::tcltest::cleanupTests +exit |