diff options
Diffstat (limited to 'itcl/iwidgets3.0.0/tests/tabnotebook.test')
| -rw-r--r-- | itcl/iwidgets3.0.0/tests/tabnotebook.test | 106 |
1 files changed, 63 insertions, 43 deletions
diff --git a/itcl/iwidgets3.0.0/tests/tabnotebook.test b/itcl/iwidgets3.0.0/tests/tabnotebook.test index bb21c582fb3..b5a7244c5ca 100644 --- a/itcl/iwidgets3.0.0/tests/tabnotebook.test +++ b/itcl/iwidgets3.0.0/tests/tabnotebook.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} { @@ -228,9 +231,15 @@ foreach test { } { set method [lindex [lindex $test 0] 1] set method_invoke [lindex $test 0] - test_pattern Tabnotebook-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 Tabnotebook-3.$m "\[$method_invoke\]" $testContents \ + [list 0 1] update incr m } @@ -238,48 +247,56 @@ foreach test { # # Method tests which fail and produce errors # +set m 1 foreach test { - {{.tn delete 0 end} {}} - {{.tn childsite 0} {can't get childsite, no pages}} - {{.tn add} {}} - {{.tn childsite 1} {bad Notebook page index in childsite method}} - {{.tn childsite -1} {bad Notebook page index in childsite method}} - {{.tn delete 0} {}} - {{.tn delete 0} {can't delete page, no pages}} - {{.tn add} {}} - {{.tn delete 1} {bad Notebook page index in delete method:}} - {{.tn delete select} {bad Notebook page index in delete method:}} - {{.tn delete 0} {}} - {{.tn add} {}} - {{.tn delete 0 1} {bad Notebook page index2 in delete method:}} - {{.tn delete 1 4} {bad Notebook page index1 in delete method:}} - {{.tn add} {}} - {{.tn delete 1 0} {bad Notebook page index1 in delete method: index1 is greater than index2}} - {{.tn delete 0 1} {}} - {{.tn add} {}} - {{.tn delete 0 1 4 5 6} {wrong # args}} - {{.tn delete} {wrong # args}} - {{.tn delete 0} {}} - {{.tn delete 0} {can't delete page}} - {{.tn delete select} {can't delete page}} - {{.tn insert 0} {can't insert page}} - {{.tn add} {}} - {{.tn add} {}} - {{.tn insert 2} {bad Notebook page index in insert method:}} - {{.tn insert -1} {bad Notebook page index}} - {{.tn delete 0 end} {}} - {{.tn next} {can't move to next page, no pages in the notebook}} - {{.tn prev} {can't move to previous page, no pages in the notebook}} - {{.tn select 0} {can't select page}} - {{.tn add} {}} - {{.tn select 1} {bad Notebook page index in select method:}} - {{.tn delete 0} {}} + {1 {.tn delete 0 end} {can't delete page}} + {1 {.tn childsite 0} {can't get childsite, no pages}} + {0 {.tn add} {}} + {1 {.tn childsite 1} {bad Notebook page index in childsite method}} + {1 {.tn childsite -1} {bad Notebook page index in childsite method}} + {0 {.tn delete 0} {}} + {1 {.tn delete 0} {can't delete page, no pages}} + {0 {.tn add} {}} + {1 {.tn delete 1} {bad Notebook page index in delete method:}} + {1 {.tn delete select} {bad Notebook page index in delete method:}} + {0 {.tn delete 0} {}} + {0 {.tn add} {}} + {1 {.tn delete 0 1} {bad Notebook page index2 in delete method:}} + {1 {.tn delete 1 4} {bad Notebook page index1 in delete method:}} + {0 {.tn add} {}} + {1 {.tn delete 1 0} {bad Notebook page index1 in delete method: index1 is greater than index2}} + {0 {.tn delete 0 1} {}} + {0 {.tn add} {}} + {1 {.tn delete 0 1 4 5 6} {wrong # args}} + {1 {.tn delete} {wrong # args}} + {0 {.tn delete 0} {}} + {1 {.tn delete 0} {can't delete page}} + {1 {.tn delete select} {can't delete page}} + {1 {.tn insert 0} {can't insert page}} + {0 {.tn add} {}} + {0 {.tn add} {}} + {1 {.tn insert 2} {bad Notebook page index in insert method:}} + {1 {.tn insert -1} {bad Notebook page index}} + {0 {.tn delete 0 end} {}} + {1 {.tn next} {can't move to next page, no pages in the notebook}} + {1 {.tn prev} {can't move to previous page, no pages in the notebook}} + {1 {.tn select 0} {can't select page}} + {0 {.tn add} {}} + {1 {.tn select 1} {bad Notebook page index in select method:}} + {0 {.tn delete 0} {}} } { - set method [lindex [lindex $test 0] 1] - set method_invoke [lindex $test 0] - test_pattern Tabnotebook-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 Tabnotebook-4.$m "\[$method_invoke\]" $testContents \ + [list $method_status 1] incr m } @@ -311,3 +328,6 @@ test Tabnotebook-1.$c {Tabnotebook destruction} { destroy .tn update } {} + +::tcltest::cleanupTests +exit |