diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bind.test | 5 | ||||
| -rw-r--r-- | tests/constraints.tcl | 1 | ||||
| -rw-r--r-- | tests/pkgconfig.test | 14 | ||||
| -rw-r--r-- | tests/scrollbar.test | 17 | ||||
| -rw-r--r-- | tests/ttk/entry.test | 3 |
5 files changed, 18 insertions, 22 deletions
diff --git a/tests/bind.test b/tests/bind.test index 7b9b714..741915a 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -13,7 +13,6 @@ eval tcltest::configure $argv tcltest::loadTestedCommands tk useinputmethods 0 -testConstraint nodeprecated [expr {"nodeprecated" ni [tk::pkgconfig list]}] testConstraint needsTcl87 [package vsatisfies [package provide Tcl] 8.7-] testConstraint failsOnWindows [expr {![info exists ::env(CI)] || [tk windowingsystem] ne "win32"}] @@ -6012,7 +6011,7 @@ test bind-28.9 {keysym names, Ð} -body { } -cleanup { destroy .t.f } -result <Key-Ð> -test bind-28.10 {keysym names, Ø} -constraints nodeprecated -body { +test bind-28.10 {keysym names, Ø} -constraints deprecated -body { frame .t.f -class Test -width 150 -height 100 bind .t.f <Ø> foo bind .t.f @@ -6026,7 +6025,7 @@ test bind-28.11 {keysym names, gcedilla} -body { } -cleanup { destroy .t.f } -result <Key-gcedilla> -test bind-28.12 {keysym names, Greek_IOTAdiaeresis -> Greek_IOTAdieresis} -constraints nodeprecated -body { +test bind-28.12 {keysym names, Greek_IOTAdiaeresis -> Greek_IOTAdieresis} -constraints deprecated -body { frame .t.f -class Test -width 150 -height 100 bind .t.f <Greek_IOTAdiaeresis> foo bind .t.f diff --git a/tests/constraints.tcl b/tests/constraints.tcl index 66ac1eb..e7ff2bc 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -256,6 +256,7 @@ testConstraint altDisplay [info exists env(TK_ALT_DISPLAY)] testConstraint noExceed [expr { ![testConstraint unix] || [catch {font actual "\{xyz"}] }] +testConstraint deprecated [expr {![package vsatisfies [package provide Tcl] 8.7-] || ![::tk::build-info no-deprecate]}] # constraints for testing facilities defined in the tktest executable... testConstraint testImageType [expr {"test" in [image types]}] diff --git a/tests/pkgconfig.test b/tests/pkgconfig.test index 7d17916..4b73a9a 100644 --- a/tests/pkgconfig.test +++ b/tests/pkgconfig.test @@ -18,24 +18,22 @@ namespace import ::tcltest::* eval tcltest::configure $argv tcltest::loadTestedCommands -testConstraint nodeprecated [expr {"nodeprecated" ni [tk::pkgconfig list]}] - -test pkgconfig-1.1 {query keys} -constraints {nonwin nodeprecated} -body { +test pkgconfig-1.1 {query keys} -constraints {nonwin} -body { lsort [::tk::pkgconfig list] } -match glob -result [list \ - 64bit bindir,install bindir,runtime debug demodir,install \ + *bindir,install bindir,runtime *demodir,install \ demodir,runtime*docdir,install docdir,runtime fontsystem \ includedir,install includedir,runtime \ - libdir,install libdir,runtime mem_debug optimized profiled \ - scriptdir,install scriptdir,runtime threaded \ + libdir,install libdir,runtime*\ + scriptdir,install scriptdir,runtime*\ ] test pkgconfig-1.2 {query keys multiple times} { string compare [::tk::pkgconfig list] [::tk::pkgconfig list] } 0 test pkgconfig-1.3 {query value multiple times} { string compare \ - [::tk::pkgconfig get 64bit] \ - [::tk::pkgconfig get 64bit] + [::tk::pkgconfig get fontsystem] \ + [::tk::pkgconfig get fontsystem] } 0 diff --git a/tests/scrollbar.test b/tests/scrollbar.test index f471b15..b35321d 100644 --- a/tests/scrollbar.test +++ b/tests/scrollbar.test @@ -13,7 +13,6 @@ tcltest::loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}] testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] -testConstraint nodeprecated [expr {"nodeprecated" ni [tk::pkgconfig list]}] proc scroll args { global scrollInfo @@ -318,7 +317,7 @@ destroy .t test scrollbar-3.43 {ScrollbarWidgetCmd procedure, "get" option} { list [catch {.s get a} msg] $msg } {1 {wrong # args: should be ".s get"}} -test scrollbar-3.44 {ScrollbarWidgetCmd procedure, "get" option} nodeprecated { +test scrollbar-3.44 {ScrollbarWidgetCmd procedure, "get" option} deprecated { .s set 100 10 13 14 .s get } {100 10 13 14} @@ -403,27 +402,27 @@ test scrollbar-3.63 {ScrollbarWidgetCmd procedure, "set" option} { } set result } {0.4 0.4} -test scrollbar-3.64 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated { +test scrollbar-3.64 {ScrollbarWidgetCmd procedure, "set" option} deprecated { list [catch {.s set abc def ghi jkl} msg] $msg } {1 {expected integer but got "abc"}} -test scrollbar-3.65 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated { +test scrollbar-3.65 {ScrollbarWidgetCmd procedure, "set" option} deprecated { list [catch {.s set 1 def ghi jkl} msg] $msg } {1 {expected integer but got "def"}} -test scrollbar-3.66 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated { +test scrollbar-3.66 {ScrollbarWidgetCmd procedure, "set" option} deprecated { list [catch {.s set 1 2 ghi jkl} msg] $msg } {1 {expected integer but got "ghi"}} -test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated { +test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} deprecated { list [catch {.s set 1 2 3 jkl} msg] $msg } {1 {expected integer but got "jkl"}} -test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated { +test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} deprecated { .s set -10 50 20 30 .s get } {0 50 0 0} -test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated { +test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} deprecated { .s set 100 -10 20 30 .s get } {100 0 20 30} -test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated { +test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} deprecated { .s set 100 50 30 20 .s get } {100 50 30 30} diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test index 8f1d4ea..61d28cf 100644 --- a/tests/ttk/entry.test +++ b/tests/ttk/entry.test @@ -9,7 +9,6 @@ loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}] testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] -testConstraint nodeprecated [expr {"nodeprecated" ni [tk::pkgconfig list]}] variable scrollInfo proc scroll args { @@ -68,7 +67,7 @@ test entry-1.7 "Deletion - insert cursor in the middle " -body { .e index insert } -result 0 -test entry-1.8 "Index is between 0 and end" -constraints nodeprecated -body { +test entry-1.8 "Index is between 0 and end" -constraints deprecated -body { .e delete 0 end .e insert end abcde set res [list [.e index -1] [.e index -4] [.e index 999]] |