Changeset 2009 for trunk/tester/testview.tcl

Timestamp:

Dec 16, 2010, 8:58:11 AM (14 years ago)

Author:

braffert

Message:

Developing regression tester

File:

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

trunk/tester/testview.tcl

@@ -29 +29 @@
     inherit itk::Widget 
 
-    public method clear {}
-    public method showTest {testxml}
-    public method showResult {runfile}
-    public method showText {text}
+    private method clear {}
+    private method showTest {testxml}
+    private method showResult {runfile}
+    private method showStatus {text}
+    private method showDescription {text}
     public method update {datapairs}
 
@@ -48 +49 @@
          [file dirname $toolxml]]
  
-    itk_component add txt {
-        text $itk_interior.txt -height 1
+    itk_component add status {
+        label $itk_interior.status
     }
-    pack $itk_component(txt) -expand no -fill x -side top
+    pack $itk_component(status) -expand no -fill none -side top -anchor w 
+
+    itk_component add scroller {
+        Rappture::Scroller $itk_interior.scroller \
+            -xscrollmode auto -yscrollmode auto
+    }
+
+    itk_component add description {
+        text $itk_interior.scroller.description -height 0 -wrap word \
+            -relief flat
+    }
+    $itk_component(scroller) contents $itk_component(description)
+    pack $itk_component(scroller) -expand no -fill x -side top
 
     itk_component add analyzer1 {
@@ -81 +94 @@
     catch {destroy $itk_component(analyzer1)}
     catch {destroy $itk_component(analyzer2)}
-    $itk_component(txt) delete 0.0 end
+    showStatus ""
+    showDescription ""
 }
 
@@ -96 +110 @@
         Rappture::Tester::TestAnalyzer $itk_interior.analyzer1 $_toolobj
     }
-    pack $itk_component(analyzer1) -expand no -fill both -side top
+    pack $itk_component(analyzer1) -expand no -fill both -side top \
+        -after $itk_component(scroller)
     $itk_component(analyzer1) display $testxml
 }
@@ -112 +127 @@
         Rappture::Tester::TestAnalyzer $itk_interior.analyzer2 $_toolobj
     }
-    pack $itk_component(analyzer2) -expand no -fill both -side top
+    pack $itk_component(analyzer2) -expand no -fill both -side top \
+        -after $itk_component(analyzer1)
     $itk_component(analyzer2) display $runfile
 }
 
 # ----------------------------------------------------------------------
-# USAGE: showText <text>
+# USAGE: showStatus <text>
 #
-# Displays a string in the text space at the top of the widget.
+# Displays a string in the status info space at the top of the widget.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Tester::TestView::showText {text} {
-    $itk_component(txt) configure -state normal
-    $itk_component(txt) delete 0.0 end
-    $itk_component(txt) insert end "$text"
-    $itk_component(txt) configure -state disabled
+itcl::body Rappture::Tester::TestView::showStatus {text} {
+    $itk_component(status) configure -text "$text"
+}
+
+# ----------------------------------------------------------------------
+# USAGE: showDescription <text>
+#
+# Displays a string in the description text space near the top of the
+# widget.  If given an empty string, disable the sunken relief effect
+# to partially hide the text box.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Tester::TestView::showDescription {text} {
+    $itk_component(description) configure -state normal
+    $itk_component(description) delete 0.0 end
+    $itk_component(description) insert end "$text"
+    $itk_component(description) configure -state disabled
+    if {$text == ""} {
+        $itk_component(description) configure -relief flat
+    } else {
+        $itk_component(description) configure -relief sunken
+    }
 }
 
@@ -145 +177 @@
         if {$data(ran)} {
             switch $data(result) {
-                Pass {showText "Test passed."}
-                Fail {showText "Diffs: $data(diffs)"}
-                Error {showText "Error while running test."}
+                Pass {showStatus "Test passed."}
+                Fail {showStatus "Test failed."}
+                Error {showStatus "Error while running test."}
             }
             if {$data(runfile) != ""} {
@@ -154 +186 @@
             }
         } else {
-            showText "Test has not yet ran."
+            showStatus "Test has not yet ran."
         }
+        set descr [[Rappture::library $data(testxml)] get test.description]
+        if {$descr == ""} {
+            set descr "No description."
+        }
+        showDescription $descr 
     } 
 }