Changeset 2012 for trunk/tester/testview.tcl

Timestamp:

Dec 17, 2010, 2:50:25 PM (14 years ago)

Author:

braffert

Message:

Developing regression tester

File:

• trunk/tester/testview.tcl (modified) (8 diffs)

trunk/tester/testview.tcl

@@ -14 +14 @@
 # ======================================================================
 package require Itk
+package require BLT 
 
 namespace eval Rappture::Tester::TestView { #forward declaration }
@@ -30 +31 @@
 
     protected method updateAnalyzer {args}
-    protected method showResult {runfile}
+    protected method updateResult {runfile}
     protected method showStatus {text}
     protected method showDescription {text}
@@ -73 +74 @@
     }
     $itk_component(tabs) insert end "Analyzer" -ipady 25 -fill both
-    $itk_component(tabs) insert end "Result" -ipady 25 -fill both
+    $itk_component(tabs) insert end "Result" -ipady 25 -fill both \
+        -state disabled
     pack $itk_component(tabs) -expand yes -fill both -side top
 
@@ -100 +102 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Tester::TestView::clear {} {
-    catch {
-        $itk_component(analyzer) clear
-        destroy $itk_component(analyzer)
-    }
-    $itk_component(tabs) invoke [$itk_component(tabs) index -name "Result"]
+    updateAnalyzer
+    updateResult
+    # TODO: Switch back to analyzer tab when disabling result tab
+    $itk_component(tabs) focus [$itk_component(tabs) index -name "Analyzer"]
     $itk_component(tabs) tab configure "Result" -state disabled 
     showStatus ""
@@ -114 +115 @@
 #
 # Clears the analyzer and loads the given library objects.  Used to load 
-# both the golden result as well as the test result.
+# both the golden result as well as the test result.  Clears the
+# analyzer space if no arguments are given.
 # Destroys the existing analyzer widget and creates a new one.  
 # Eventually this should be able to keep the same widget and swap in
@@ -136 +138 @@
 
 # ----------------------------------------------------------------------
-# TODO: fill this in
-# ----------------------------------------------------------------------
-itcl::body Rappture::Tester::TestView::showResult {runfile} {
-    $itk_component(tabs) tab configure "Result" -state normal 
-    $itk_component(result) delete 0.0 end
-    $itk_component(result) insert end $runfile
+# USAGE: updateResult ?datapairs?
+#
+# Given a set of key value pairs from the test tree, update the result
+# page of the testview widget.  If no arguments are given, disable the
+# result page.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Tester::TestView::updateResult {args} {
+    if {[llength $args] == 0} {
+        $itk_component(result) delete 0.0 end 
+        $itk_component(tabs) focus [$itk_component(tabs) index -name "Result"]
+        $itk_component(tabs) tab configure "Result" -state disabled
+        return
+    } elseif {[llength $args] == 1} {
+        array set data [lindex $args 0]
+        $itk_component(tabs) tab configure "Result" -state normal
+        $itk_component(result) delete 0.0 end
+        $itk_component(result) insert end "Test xml: $data(testxml)\n"
+        $itk_component(result) insert end "Runfile: $data(runfile)\n"
+        if {$data(result) == "Fail"} {
+            $itk_component(result) insert end "Diffs: $data(diffs)\n" 
+        }
+    } else {
+        error "wrong # args: should be \"updateResult ?datapairs?\""
+    }
 }
 
@@ -197 +217 @@
                 $result put input.run.current "Test"
                 updateAnalyzer $golden $result 
-                showResult $data(runfile)
+                updateResult $datapairs 
+            } else {
+                updateResult 
             }
         } else {
             showStatus "Test has not yet ran."
+            updateResult
             if {$data(testxml) != ""} {
                 updateAnalyzer [Rappture::library $data(testxml)] 
@@ -211 +234 @@
         showDescription $descr 
     } else {
-       # clear entire screen if branch node selected
-#       clear
-    }
-}
-
+       # clear everything if branch node selected
+       clear
+    }
+}
+