Changeset 2030 for trunk

Timestamp:

Jan 13, 2011 12:14:50 PM (13 years ago)

Author:

braffert

Message:

 

Location:

trunk/tester

Files:

• tester.tcl (modified) (4 diffs)
• testtree.tcl (modified) (2 diffs)
• testview.tcl (modified) (4 diffs)

trunk/tester/tester.tcl

@@ -42 +42 @@
 # If tool.xml and test directory locations are not given, try to find them.
 if {$params(-tool) == ""} {
-    if {[file exists tool.xml]} {
+    if {[file isfile tool.xml]} {
         set params(-tool) tool.xml
-    } elseif {[file exists [file join rappture tool.xml]]} {
+    } elseif {[file isfile [file join rappture tool.xml]]} {
         set params(-tool) [file join rappture tool.xml]
     } else {
-        error "Cannot find tool.xml"
+        puts "Cannot find tool.xml"
+        exit 1
     }
+} elseif {![file isfile $params(-tool)]} {
+    puts "Tool \"$params(-tool)\" does not exist"
+    exit 1
 }
 
@@ -58 +62 @@
         set params(-testdir) [file join [file dirname $tooldir] tests]
     } else {
-        error "Cannot find test directory."
+        puts "Cannot find test directory"
+        exit 1
     }
+} elseif {![file isdirectory $params(-testdir)]} {
+    puts "Test directory \"$params(-testdir)\" does not exist"
+    exit 1
 }
 
@@ -67 +75 @@
 wm title . "Rappture Regression Tester"
 panedwindow .pw
+
 .pw add [Rappture::Tester::TestTree .tree \
     -testdir $params(-testdir) \
     -toolxml $params(-tool) \
     -selectcommand Rappture::Tester::selectionHandler]
+
 .pw add [frame .right]
 Rappture::Tester::TestView .right.view
@@ -77 +87 @@
 pack .right.regoldenize -side bottom -anchor e
 pack .right.view -side bottom -expand yes -fill both
+
 pack .pw -expand yes -fill both
+
 set lastsel ""
 
 # TODO: Handle resizing better
 # TODO: Fix error that occurs only when you click and hold on a test
-#       while the right hand side is empty
+#       while the right hand side is empty.  Adding lastsel check
+#       removed the error, but tree selection still acts strange when
+#       holding down the mouse button.  selectionHandler actually gets
+#       invoked twice, somehow leading to an event dispatch error.
+#       If selectionHandler does NOT reconfigure the right side with the
+#       selected test, then no error occurs.
 
 # ----------------------------------------------------------------------
-# USAGE: selectionHandler
+# USAGE: selectionHandler ?-refresh?
 #
 # Used internally to communicate between the test tree and the right
 # hand side viewer.  Upon selecting a new tree node, pass the focused
-# node's data to the right hand side.
+# node's data to the right hand side.  Use the -refresh option to force
+# the selected test to be re-displayed on the right side.
 # ----------------------------------------------------------------------
 proc Rappture::Tester::selectionHandler {args} {
     global lastsel
     set test [.tree getTest]
-    if {$test != $lastsel} {
-        .right.view configure -test $test 
+    if {$test != $lastsel || [lsearch $args "-refresh"] != -1} {
+        .right.view configure -test $test
         if {$test != "" && [$test hasRan] && [$test getResult] != "Error"} {
             .right.regoldenize configure -state normal

trunk/tester/testtree.tcl

@@ -135 +135 @@
 itcl::configbody Rappture::Tester::TestTree::selectcommand {
     $itk_component(treeview) configure -selectcommand \
-        "[itcl::code $itk_interior updateLabel]; $selectcommand"
+        "[itcl::code $this updateLabel]; $selectcommand"
 }
 
@@ -279 +279 @@
         runTest $id
     }
-    eval $selectcommand
+    eval $selectcommand -refresh
 }
 

trunk/tester/testview.tcl

@@ -70 +70 @@
     } {
     }
-    $itk_component(tabs) insert end "Analyzer" -ipady 25 -fill both
+    $itk_component(tabs) insert end "Results" -ipady 25 -fill both
     $itk_component(tabs) insert end "Info" -ipady 25 -fill both \
         -state disabled
@@ -77 +77 @@
     #    Rappture::ResultsPage $itk_component(tabs).analyzer
     #}
-    #$itk_component(tabs) tab configure "Analyzer" \
+    #$itk_component(tabs) tab configure "Results" \
     #    -window $itk_component(tabs).analyzer
 
@@ -200 +200 @@
         Rappture::ResultsPage $itk_component(tabs).analyzer
     }
-    $itk_component(tabs) tab configure "Analyzer" \
+    $itk_component(tabs) tab configure "Results" \
         -window $itk_component(analyzer)
     foreach lib $args {
@@ -217 +217 @@
     if {[llength $args] == 0} {
         $itk_component(info) delete 0.0 end
-        # TODO: Switch back to analyzer tab.  Why doesn't this work?
-        $itk_component(tabs) invoke \
-            [$itk_component(tabs) index -name "Analyzer"]
+        # TODO: Switch back to results tab.  Why doesn't this work?
+        set index [$itk_component(tabs) index -name "Results"]
+        $itk_component(tabs) select $index
+        $itk_component(tabs) focus $index
         $itk_component(tabs) tab configure "Info" -state disabled
         return