Changeset 1964 for trunk/tester

Timestamp:

Nov 25, 2010, 5:54:57 PM (14 years ago)

Author:

braffert

Message:

Developing regression tester

Location:

trunk/tester

Files:

• images (deleted)
• mainwin.tcl (modified) (5 diffs)
• tester.tcl (modified) (2 diffs)
• testtree.tcl (modified) (5 diffs)
• testview.tcl (modified) (2 diffs)

trunk/tester/mainwin.tcl

@@ -3 +3 @@
 #
 #  This widget acts as the main window for the Rappture regression
-#  tester.  Constructor accepts the location of the new version to be
-#  tested, and the location of a directory containg test xml files.
+#  tester.  Constructor accepts the location of the tool.xml of the new 
+#  version to be tested, and the location of a directory containg test 
+#  xml files.
 # ======================================================================
 #  AUTHOR:  Ben Rafferty, Purdue University
@@ -21 +22 @@
     inherit itk::Toplevel
 
-    constructor {tooldir testdir} { #defined later }
+    constructor {toolxml testdir args} { #defined later }
     public method runAll {}
     public method runSelected {}
@@ -28 +29 @@
 
     private variable _testdir
-    private variable _tooldir
     private variable _toolxml
 
@@ -42 +42 @@
 }
 
-itcl::body Rappture::Regression::MainWin::constructor {tooldir testdir} {
+itcl::body Rappture::Regression::MainWin::constructor {toolxml testdir args} {
     puts "Constructing MainWin."
 
-    # TODO: Replace explicit constructor arguments with "args"
-    #       If tooldir is not given, use current directory.
-    #       If testdir is not given, look for it inside of tooldir.
-    if {[file isdirectory $tooldir]} {
-        set _tooldir $tooldir
+    if {[file exists $toolxml]} {
+        set _toolxml $toolxml
     } else {
-        # TODO: Properly format error messages
-        error "Given tooldir is not a directory."
+        error "File \"$toolxml\" does not exist."
     }
+
     if {[file isdirectory $testdir]} {
         set _testdir $testdir
     } else {
-        error "Given testdir is not a directory"
+        error "Directory \"$testdir\" does not exist."
     }
 
-    # TODO: Check other locations for tool.xml and throw error if not found
-    set _toolxml [file join $tooldir tool.xml]
+    itk_component add pw {
+        panedwindow $itk_interior.pw
+    }
+    pack $itk_component(pw) -expand yes -fill both
 
-    itk_component add topBar {
-        frame $itk_interior.topBar
+    itk_component add tree {
+        Rappture::Regression::TestTree $itk_component(pw).tree \
+            -command "$this runSelected" -testdir $_testdir
     }
-    itk_component add cmdLabel {
-        label $itk_component(topBar).cmdLabel -text "Tool command:"
+    $itk_component(pw) add $itk_component(tree) -sticky nsew
+
+    itk_component add view {
+        Rappture::Regression::TestView $itk_component(pw).view
     }
-    itk_component add cmdEntry {
-        entry $itk_component(topBar).cmdEntry
-    }
-    itk_component add bRunAll {
-        button $itk_component(topBar).bRunAll -text "Run all" \
-            -command [itcl::code $itk_interior runAll] 
-    }
-    itk_component add bRunSelected {
-        button $itk_component(topBar).bRunSelected -text "Run selected" \
-            -command [itcl::code $itk_interior runSelected]
-    }
-    pack $itk_component(cmdLabel) -side left
-    pack $itk_component(cmdEntry) -side left -expand yes -fill x
-    pack $itk_component(bRunAll) -side right
-    pack $itk_component(bRunSelected) -side right
-    pack $itk_component(topBar) -side top -fill x
+    $itk_component(pw) add $itk_component(view) -sticky nsew
 
-    itk_component add pane {
-        panedwindow $itk_interior.pane
-    }
-    itk_component add tree {
-        Rappture::Regression::TestTree $itk_component(pane).tree $testdir
-    }
-    itk_component add view {
-        Rappture::Regression::TestView $itk_component(pane).view
-    }
-    $itk_component(pane) add  $itk_component(pane).tree -sticky nesw
-    $itk_component(pane) add  $itk_component(pane).view -sticky nesw
     # TODO: make panes scale proportionally when window grows
-    pack $itk_component(pane) -side left -expand yes -fill both
+
+    eval itk_initialize $args
 }
 
@@ -151 +128 @@
     set driver [makeDriver $testxml]
 
-    set tool [Rappture::Tool ::#auto $driver $_tooldir]
+    set tool [Rappture::Tool ::#auto $driver [file dirname $_toolxml]]
     set result ""
     foreach {status result} [eval $tool run] break

trunk/tester/tester.tcl

@@ -10 +10 @@
 # hierarchically by using dots to separate components of the test label
 # (example: roomtemp.1eV).  A description may optionally be located at
-# the path test.description.
+# the path test.description.  Input arguments are the path to the
+# tool.xml of the version being tested, and the path the the directory
+# containing a set of test xml files.  If the arguments are missing,
+# the program will attempt to locate them automatically.
+#
+# USAGE: tester.tcl ?-tool tool.xml? ?-testdir tests?
 # ======================================================================
 #  AUTHOR:  Ben Rafferty, Purdue University
@@ -23 +28 @@
 # wish executes everything from here on...
 
-# TODO: Use tclIndex to manage classes correctly
-source mainwin.tcl
-source testtree.tcl
-source testview.tcl
-source compare.tcl
+# TODO: Won't need this once tied in with the rest of the package 
+lappend auto_path [file dirname $argv0]
+
+package require Tk
+package require Rappture
+package require RapptureGUI
 
 wm withdraw .
 
-set testdir "example/tests"
-set tooldir "example"
+Rappture::getopts argv params {
+    value -tool ""
+    value -testdir ""
+}
 
-::Rappture::Regression::MainWin .main $tooldir $testdir
+# If tool.xml and test directory locations are not given, try to find them.
+if {$params(-tool) == ""} {
+    if {[file exists tool.xml]} {
+        set params(-tool) tool.xml
+    } elseif {[file exists [file join rappture tool.xml]]} {
+        set params(-tool) [file join rappture tool.xml]
+    } else {
+        error "Cannot find tool.xml"
+    }
+}
+
+if {$params(-testdir) == ""} {
+    set tooldir [file dirname $params(-tool)]
+    if {[file isdirectory [file join $tooldir tests]]} {
+        set params(-testdir) [file join $tooldir tests]
+    } elseif {[file isdirectory [file join [file dirname $tooldir] tests]]} {
+        set params(-testdir) [file join [file dirname $tooldir] tests]
+    } else {
+        error "Cannot find test directory."
+    }
+}
+
+::Rappture::Regression::MainWin .main $params(-tool) $params(-testdir)
 bind .main <Destroy> {exit}
 

trunk/tester/testtree.tcl

@@ -3 +3 @@
 #
 #  Used to display a collapsible view of all tests found in the test
-#  directory.  Essentially an Itk Widget wrapper for blt::treeview.
-#  Provides methods to get all tests or all currently selected tests.
-#  Also helps handle data stored in treeview columns.  In each test xml,
-#  a label must be located at the path test.label.  Test labels may be
-#  be organized hierarchically by using dots to separate components of
-#  the test label.  (example: roomtemp.1eV)
+#  directory.  The -command configuration option will be called when
+#  the run button is clicked. Provides methods to get all tests or all 
+#  currently selected tests. Also helps handle data stored in treeview 
+#  columns.  In each test xml, a label must be located at the path 
+#  test.label.  Test labels may be organized hierarchically by using 
+#  dots to separate components of the test label.
 # ======================================================================
 #  AUTHOR:  Ben Rafferty, Purdue University
@@ -23 +23 @@
 
 itcl::class Rappture::Regression::TestTree {
-    inherit itk::Widget
-
-    constructor {testdir} { #defined later }
-    public method populate {testdir}
+    inherit itk::Widget 
+
+    public variable command
+    public variable testdir
+
+    constructor {testdir args} { #defined later }
     public method getTests {{id 0}}
     public method getSelected {}
     public method getData {id}
     public method setData {id data}
+    public method updateLabel {}
+
+    private method populate {}
 }
 
@@ -41 +46 @@
 }
 
-itcl::body Rappture::Regression::TestTree::constructor {testdir} {
+itcl::body Rappture::Regression::TestTree::constructor {args} {
     # TODO: Use separate tree data structure and insert into treeview
-    puts "Constructing TestTree."
+    puts "Constructinig TestTree."
+
     itk_component add treeview {
         blt::treeview $itk_interior.treeview -separator . -autocreate true \
-            -selectmode multiple
-    }
-    $itk_component(treeview) column insert end xmlfile ran result diffs
+            -selectmode multiple 
+    }
+    $itk_component(treeview) column insert 0 result
+    $itk_component(treeview) column insert end xmlfile ran diffs
     $itk_component(treeview) column configure xmlfile ran diffs -hide yes
     pack $itk_component(treeview) -expand yes -fill both
-    populate $testdir
-    # TODO: Fix default column spacing. Column name for the main/first column?
+
+    itk_component add bottomBar {
+        frame $itk_interior.bottomBar
+    }
+    pack $itk_component(bottomBar) -fill x
+
+    itk_component add bSelectAll {
+        button $itk_component(bottomBar).bSelectAll -text "Select all" \
+            -command "$itk_component(treeview) selection set 0 end" 
+    }
+    pack $itk_component(bSelectAll) -side left
+
+    itk_component add bSelectNone {
+        button $itk_component(bottomBar).bSelectNone -text "Select none" \
+            -command "$itk_component(treeview) selection clearall"
+    }
+    pack $itk_component(bSelectNone) -side left
+
+    itk_component add lSelected {
+        label $itk_component(bottomBar).lSelected -text "0 tests selected"
+    }
+    pack $itk_component(lSelected) -side left -expand yes -fill x
+    $itk_component(treeview) configure -selectcommand "$this updateLabel"
+
+    itk_component add bRun {
+        button $itk_component(bottomBar).bRun -text "Run" -command runHandler \
+            -state disabled
+    }
+    pack $itk_component(bRun) -side left
+
     # TODO: Fix black empty space when columns are shrunk
-}
-
+    # TODO: Scrollbar(s)
+
+    eval itk_initialize $args
+}
+
+# Repopulate tree if test directory changed
+itcl::configbody Rappture::Regression::TestTree::testdir {
+    populate
+}
+
+itcl::configbody Rappture::Regression::TestTree::command {
+    $itk_component(bRun) configure -command $command
+}
 
 # ----------------------------------------------------------------------
@@ -66 +112 @@
 # any nodes previously contained by the treeview.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Regression::TestTree::populate {testdir} {
+itcl::body Rappture::Regression::TestTree::populate {} {
     puts "Populating TestTree."
     $itk_component(treeview) delete 0
-    # TODO: Make file icon background transparent.
-    set icon [image create photo -file images/file.gif]
+    # TODO: add an appropriate icon
+    set icon [Rappture::icon download]
     # TODO: Descend through subdirectories inside testdir?
     foreach testxml [glob -nocomplain -directory $testdir *.xml] {
@@ -150 +196 @@
 }
 
-
+# ----------------------------------------------------------------------
+# USAGE: updateLabel
+#
+# Used internally to update the label which indicates how many tests
+# are currently selected.  Also disables the run button if no tests are
+# selected.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Regression::TestTree::updateLabel {} {
+    set n [llength [getSelected]]
+    $itk_component(lSelected) configure -text "$n tests selcted"
+    if {$n > 0} {
+        $itk_component(bRun) configure -state normal
+    } else {
+        $itk_component(bRun) configure -state disabled
+    }
+}
+

trunk/tester/testview.tcl

@@ -17 +17 @@
     inherit itk::Widget
 
-    constructor {} { #defined later }
+    constructor {args} { #defined later }
 }
 
-itcl::body Rappture::Regression::TestView::constructor {} {
+itcl::body Rappture::Regression::TestView::constructor {args} {
     puts "Constructing TestView."
     itk_component add txt {
@@ -28 +28 @@
     $itk_component(txt) insert end "TestView text area..."
     $itk_component(txt) configure -state disabled
+
+    eval itk_initialize $args
 }