Convert from approach B => A (revert access procs to the original var…

…iable references), domain dialog
tcltk · Feb 13, 2025 · 4e9ee4b · 4e9ee4b
1 parent a10aea2
commit 4e9ee4b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 36 deletions.
diff --git a/tests/choosedir.test b/tests/choosedir.test
@@ -11,8 +11,8 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 # Import utility procs for specific functional areas
-testutils import -novars dialog
-setDialogType choosedir
+testutils import dialog
+set dialogType choosedir
 
 #----------------------------------------------------------------------
 #
@@ -142,7 +142,6 @@ test choosedir-5.1 {tk_chooseDirectory, handles {} entry text} -constraints {
 #
 
 removeDirectory choosedirTest
-setDialogType none
 testutils forget dialog
 cleanupTests
 return
diff --git a/tests/clrpick.test b/tests/clrpick.test
@@ -11,8 +11,8 @@ tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 # Import utility procs for specific functional areas
-testutils import -novars dialog
-setDialogType clrpick
+testutils import dialog
+set dialogType clrpick
 
 if {[testConstraint defaultPseudocolor8]} {
     # let's soak up a bunch of colors...so that
@@ -172,7 +172,6 @@ test clrpick-4.1 {tk_chooseColor: screen is inherited from parent} -constraints
 # CLEANUP
 #
 
-setDialogType none
 testutils forget dialog
 cleanupTests
 return
diff --git a/tests/filebox.test b/tests/filebox.test
@@ -11,8 +11,8 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 # Import utility procs for specific functional areas
-testutils import -novars dialog
-setDialogType filebox
+testutils import dialog
+set dialogType filebox
 
 test fileDialog-0.1 {GetFileName: file types: MakeFilter() fails} {
     # MacOS type that is too long
@@ -445,7 +445,6 @@ foreach mode $modes {
 
 set tk_strictMotif $tk_strictMotif_old
 removeFile filebox.tmp
-setDialogType none
 testutils forget dialog
 cleanupTests
 return
diff --git a/tests/fontchooser.test b/tests/fontchooser.test
@@ -9,7 +9,7 @@ tcltest::loadTestedCommands
 # Import utility procs for specific functional areas
 testutils import dialog
 
-set applyFontCmd [list testDialogFont set]
+set applyFontCmd [list set testDialogFont]
 
 # -------------------------------------------------------------------------
 
@@ -107,7 +107,7 @@ test fontchooser-4.0 {fontchooser -font} -constraints scriptImpl -body {
     testDialog onDisplay {
 	Click cancel
     }
-    testDialogFont get
+    set testDialogFont
 } -result {}
 
 test fontchooser-4.1 {fontchooser -font} -constraints scriptImpl -body {
@@ -118,7 +118,7 @@ test fontchooser-4.1 {fontchooser -font} -constraints scriptImpl -body {
     testDialog onDisplay {
 	Click ok
     }
-    expr {[testDialogFont get] ne {}}
+    expr {$testDialogFont ne {}}
 } -result 1
 
 test fontchooser-4.2 {fontchooser -font} -constraints scriptImpl -body {
@@ -129,7 +129,7 @@ test fontchooser-4.2 {fontchooser -font} -constraints scriptImpl -body {
     testDialog onDisplay {
 	Click ok
     }
-    expr {[testDialogFont get] ne {}}
+    expr {$testDialogFont ne {}}
 } -result 1
 
 test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
@@ -140,7 +140,7 @@ test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
     testDialog onDisplay {
 	Click ok
     }
-    expr {[testDialogFont get] ne {}}
+    expr {$testDialogFont ne {}}
 } -result 1
 
 test fontchooser-4.4 {fontchooser -font} -constraints {scriptImpl havePointsize14BoldFont} -body {
@@ -151,7 +151,7 @@ test fontchooser-4.4 {fontchooser -font} -constraints {scriptImpl havePointsize1
     testDialog onDisplay {
 	Click ok
     }
-    lrange [testDialogFont get] 1 end
+    lrange $testDialogFont 1 end
 } -result {14 bold}
 
 test fontchooser-5.1 {fontchooser multiple configure} -constraints {scriptImpl} -body {

diff --git a/tests/msgbox.test b/tests/msgbox.test
@@ -11,8 +11,8 @@ tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 # Import utility procs for specific functional areas
-testutils import -novars dialog
-setDialogType msgbox
+testutils import dialog
+set dialogType msgbox
 
 test msgbox-1.1.1 {tk_messageBox command} -constraints notAqua -body {
     tk_messageBox -foo

diff --git a/tests/testutils.tcl b/tests/testutils.tcl
@@ -520,6 +520,7 @@ namespace eval ::tk::test::dialog {
     proc init {} {
 	variable dialogType none
 	variable testDialog
+	variable testDialogFont
     }
 
     proc Click {button} {
@@ -590,10 +591,6 @@ namespace eval ::tk::test::dialog {
 	}
     }
 
-    proc setDialogType {type} {
-	variable dialogType $type
-    }
-
     proc testDialog {stage {script ""}} {
 	variable testDialogCmd
 	variable testDialogResult
@@ -665,10 +662,8 @@ namespace eval ::tk::test::dialog {
 	}
     }
 
-    ::tk::test::createStdAccessProc testDialogFont
-
-    namespace export Click PressButton SendButtonPress setDialogType testDialog \
-	    testDialogFont ToPressButton
+    namespace export Click PressButton SendButtonPress testDialog \
+	    ToPressButton
 }
 
 

diff --git a/tests/winDialog.test b/tests/winDialog.test
@@ -14,7 +14,7 @@ tcltest::loadTestedCommands
 
 # Import utility procs for specific functional areas
 testutils import dialog
-set applyFontCmd [list testDialogFont set]
+set applyFontCmd [list set testDialogFont]
 
 if {[testConstraint testwinevent]} {
     catch {testwinevent debug 1}
@@ -31,24 +31,27 @@ testConstraint english [expr {
 set initialDir [tcltest::temporaryDirectory]
 
 proc Click {button} {
+    variable testDialog
     switch -exact -- $button {
 	ok     { set button 1 }
 	cancel { set button 2 }
     }
-    testwinevent $::testDialog $button WM_LBUTTONDOWN 1 0x000a000b
-    testwinevent $::testDialog $button WM_LBUTTONUP 0 0x000a000b
+    testwinevent $testDialog $button WM_LBUTTONDOWN 1 0x000a000b
+    testwinevent $testDialog $button WM_LBUTTONUP 0 0x000a000b
 }
 
 proc GetText {id} {
+    variable testDialog
     switch -exact -- $id {
 	ok     { set id 1 }
 	cancel { set id 2 }
     }
-    return [testwinevent $::testDialog $id WM_GETTEXT]
+    return [testwinevent $testDialog $id WM_GETTEXT]
 }
 
 proc SetText {id text} {
-    return [testwinevent $::testDialog $id WM_SETTEXT $text]
+    variable testDialog
+    return [testwinevent $testDialog $id WM_SETTEXT $text]
 }
 
 # ----------------------------------------------------------------------
@@ -863,7 +866,7 @@ test winDialog-10.1 {Tk_FontchooserObjCmd: no arguments} -constraints {
     testDialog launch {tk fontchooser show}
     list [testDialog onDisplay {
 	Click cancel
-    }] [testDialogFont get]
+    }] $testDialogFont
 } -result {0 {}}
 test winDialog-10.2 {Tk_FontchooserObjCmd: -initialfont} -constraints {
     nt testwinevent
@@ -874,7 +877,7 @@ test winDialog-10.2 {Tk_FontchooserObjCmd: -initialfont} -constraints {
     }
     list [testDialog onDisplay {
 	Click cancel
-    }] [testDialogFont get]
+    }] $testDialogFont
 } -result {0 {}}
 test winDialog-10.3 {Tk_FontchooserObjCmd: -initialfont} -constraints {
     nt testwinevent
@@ -885,7 +888,7 @@ test winDialog-10.3 {Tk_FontchooserObjCmd: -initialfont} -constraints {
     }
     list [testDialog onDisplay {
 	Click 1
-    }] [expr {[llength [testDialogFont get]] ne {}}]
+    }] [expr {[llength $testDialogFont] ne {}}]
 } -result {0 1}
 test winDialog-10.4 {Tk_FontchooserObjCmd: -title} -constraints {
     nt testwinevent
@@ -896,7 +899,7 @@ test winDialog-10.4 {Tk_FontchooserObjCmd: -title} -constraints {
     }
     list [testDialog onDisplay {
 	Click cancel
-    }] [testDialogFont get]
+    }] $testDialogFont
 } -result {0 {}}
 test winDialog-10.5 {Tk_FontchooserObjCmd: -parent} -constraints {
     nt testwinevent
@@ -911,7 +914,7 @@ test winDialog-10.5 {Tk_FontchooserObjCmd: -parent} -constraints {
 	array set a [testgetwindowinfo $testDialog]
 	Click cancel
     }
-    list [expr {$a(parent) == [wm frame .]}] [testDialogFont get]
+    list [expr {$a(parent) == [wm frame .]}] $testDialogFont
 } -result {1 {}}
 test winDialog-10.6 {Tk_FontchooserObjCmd: -apply} -constraints {
     nt testwinevent
@@ -934,7 +937,7 @@ test winDialog-10.7 {Tk_FontchooserObjCmd: -apply} -constraints {
     list [testDialog onDisplay {
 	Click [expr {0x0402}] ;# value from XP
 	Click cancel
-    }] [expr {[llength [testDialogFont get]] > 0}]
+    }] [expr {[llength $testDialogFont] > 0}]
 } -result {0 1}
 test winDialog-10.8 {Tk_FontchooserObjCmd: -title} -constraints {
     nt testwinevent