1 files changed, 51 insertions, 4 deletions
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index ddfaf84..def709e 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -6,6 +6,14 @@ loadTestedCommands
 proc skip args {}
 proc ok {} { return }
 
+variable widgetClasses {
+    button checkbutton radiobutton menubutton label entry
+    frame labelframe scrollbar
+    notebook progressbar combobox separator
+    panedwindow treeview sizegrip
+    scale
+}
+
 proc bgerror {error} {
     variable bgerror $error
     variable bgerrorInfo $::errorInfo
@@ -62,10 +70,7 @@ test ttk-6.6 "Bad color spec in styles" -body {
 } -result {unknown color name "badColor"}
 
 test ttk-6.7 "Basic destruction test" -body {
-    foreach widget {
-	button checkbutton radiobutton sizegrip separator notebook
-	progressbar panedwindow scrollbar
-    } {
+    foreach widget $widgetClasses {
 	ttk::$widget .w
 	pack .w
 	destroy .w
@@ -214,6 +219,21 @@ test ttk-2.8 "bug 3223850: button state disabled during click" -setup {
     unset -nocomplain ttk28 aid
 } -result 1
 
+foreach wc $widgetClasses {
+    test ttk-coreoptions-$wc "$wc has all core options" -body {
+	ttk::$wc .w
+	foreach option {
+	    -class
+	    -style
+	    -cursor
+	    -takefocus
+	} {
+	    .w cget $option
+	}
+	destroy .w
+    }
+}
+
 # misc. error detection
 test ttk-3.0 "Bad option" -body {
     ttk::button .bad -badoption foo
@@ -555,6 +575,33 @@ test ttk-14.3 "-textvariable in nonexistant namespace" -body {
 } -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
   -match glob -cleanup { destroy .tw }
 
+test ttk-15.1 {Bug 3062331} -setup {
+    destroy .b
+} -body {
+    set Y {}
+    ttk::button .b -textvariable Y
+    trace variable Y u "destroy .b; #"
+    unset Y
+} -cleanup {
+    destroy .b
+} -result {}
+
+test ttk-15.2 {Bug 3341056} -setup {
+    proc foo {} {
+	destroy .lf
+	ttk::labelframe .lf
+	ttk::checkbutton .lf.cb -text xxx
+    }
+} -body {
+    ttk::button .b -text xxx -command foo
+    .b invoke
+    .b invoke
+    .lf.cb invoke
+    destroy .b
+} -cleanup {
+    rename foo {}
+    destroy .lf
+} -result {}
 
 ## Test ensemble processing:
 #