Changeset 2086 for trunk

Timestamp:

Feb 7, 2011, 3:04:42 PM (14 years ago)

Author:

braffert

Message:

tester: fixing regoldenize feature

Location:

trunk/tester/scripts

Files:

• main.tcl (modified) (3 diffs)
• test.tcl (modified) (5 diffs)

trunk/tester/scripts/main.tcl

@@ -147 +147 @@
 pack $win.testview.bbar.viewoutputs -side right 
 Rappture::Tooltip::for $win.testview.bbar.viewoutputs \
-    "Display the outputs for this test case as they would be seen when running the tool normally.  If the test has completed with no error, the new results can be compated against the set of golden results."
+    "Display the outputs for this test case as they would be seen when running the tool normally.  If the test has completed with no error, the new results can be compared against the set of golden results."
 
 pack $win.testview.bbar -side bottom -fill x
@@ -388 +388 @@
 proc tester_regoldenize {} {
     set testtree [.pw pane 0].tree
-
-    set test [$testtree getTest]
+    set tests [$testtree curselection]
+
+    if {[llength $tests] != 1} {
+        error "Cannot regoldenize. One test must be selected"
+    }
+
+    set test [lindex $tests 0]
     set testxml [$test getTestxml]
     if {[tk_messageBox -type yesno -icon warning -message "Are you sure you want to regoldenize?\n$testxml will be overwritten."]} {
@@ -402 +407 @@
 # USAGE: tester_view_outputs
 #
-# TODO
-# ----------------------------------------------------------------------
-proc tester_view_outputs {args} {
+# Displays the outputs of the currently selected test case as they would
+# be seen when running the tool normally.  If the test has completed
+# with no error, then show the new outputs alongside the golden results.
+# ----------------------------------------------------------------------
+proc tester_view_outputs {} {
     set testtree [.pw pane 0].tree
     set rhs [.pw pane 1]

trunk/tester/scripts/test.tcl

@@ -28 +28 @@
     public method getRunobj {}
     public method getTestobj {}
+    public method getTestxml {}
 
     public method run {args}
@@ -74 +75 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Tester::Test::destructor {} {
-    # TODO: toolobj is created in main.tcl and passed into all tests
-    #  when they are created.  Should we really delete it here whenever
-    #  a test is destroyed?
-    itcl::delete object $_toolobj
     itcl::delete object $_testobj
-    if {$_runobj ne ""} {
+    # runobj can point to testobj if the test has just been
+    # regoldenized.  Don't try to delete twice.
+    if {$_runobj ne "" && $_runobj ne $_testobj} {
         itcl::delete object $_runobj
     }
@@ -178 +177 @@
 # result attributes to reflect the changes. Throws an error if the test
 # has not been run.
+#
+# After regoldenizing, _testobj and _runobj will both refer to the same
+# library object, and the previous _runobj will be discarded.
 # ----------------------------------------------------------------------
 itcl::body Rappture::Tester::Test::regoldenize {} {
@@ -194 +196 @@
     set _testobj $_runobj
 
-    set _runobj ""
     set _diffs ""
     _setResult Pass
@@ -230 +231 @@
 itcl::body Rappture::Tester::Test::getTestobj {} {
     return $_testobj
+}
+
+# ----------------------------------------------------------------------
+# USAGE: getTestxml
+#
+# Returns the name of the xml file representing the test case.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Tester::Test::getTestxml {} {
+    return $_testxml
 }