Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl 14 Feb 2004 19:19:38 -0000 1.6
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl 16 Feb 2004 14:03:45 -0000 1.7
@@ -1,93 +1,113 @@
ad_page_contract {
- @cvs-id $Id$
+ @cvs-id $Id$
} {
- testcase_id:nohtml
- package_key:nohtml
- {showsource 0}
- {quiet 0}
+ testcase_id:nohtml
+ package_key:nohtml
+ {showsource 0}
+ {quiet 0}
} -properties {
- title:onevalue
- context_bar:onevalue
- tests:multirow
- showsource:onevalue
- testcase_desc:onevalue
- testcase_file:onevalue
- testcase_on_error:onevalue
- bodys:multirow
- quiet:onevalue
- fails:onevalue
+ title:onevalue
+ context_bar:onevalue
+ tests:multirow
+ showsource:onevalue
+ testcase_desc:onevalue
+ testcase_file:onevalue
+ testcase_on_error:onevalue
+ bodys:multirow
+ quiet:onevalue
+ fails:onevalue
}
set title "Test case $testcase_id"
set context [list $title]
db_multirow tests acs-automated-testing.testcase_query {
- select to_char(timestamp,'DD-MM-YYYY HH24:MI:SS') timestamp, result, notes
- from aa_test_results
- where testcase_id = :testcase_id and
- package_key = :package_key
- order by test_id
+ select to_char(timestamp,'DD-MM-YYYY HH24:MI:SS') timestamp, result, notes
+ from aa_test_results
+ where testcase_id = :testcase_id and
+ package_key = :package_key
+ order by test_id
+} {
+ if { ![info exists test_count($result)] } {
+ set test_count($result) 1
+ } else {
+ incr test_count($result)
+ }
}
+multirow create tests_quiet result count
+foreach result [array names test_count] {
+ multirow append tests_quiet $result $test_count($result)
+}
+
if {![db_0or1row acs-automated-testing.get_testcase_fails_count {
- select fails
- from aa_test_final_results
- where testcase_id = :testcase_id
+ select fails
+ from aa_test_final_results
+ where testcase_id = :testcase_id
}]} {
- set fails -1
+ set fails -1
}
set testcase_bodys {}
foreach testcase [nsv_get aa_test cases] {
- if {$testcase_id == [lindex $testcase 0] &&
- $package_key == [lindex $testcase 3]} {
- set testcase_desc [lindex $testcase 1]
- set testcase_file [lindex $testcase 2]
- set package_key [lindex $testcase 3]
- set testcase_cats [join [lindex $testcase 4] ", "]
- set testcase_inits [join [lindex $testcase 5] ", "]
- set testcase_on_error [lindex $testcase 6]
- set testcase_bodys [lindex $testcase 7]
- set testcase_error_level [lindex $testcase 8]
- set testcase_bugs [lindex $testcase 9]
- }
+ if {$testcase_id == [lindex $testcase 0] &&
+ $package_key == [lindex $testcase 3]} {
+ set testcase_desc [lindex $testcase 1]
+ set testcase_file [lindex $testcase 2]
+ set package_key [lindex $testcase 3]
+ set testcase_cats [join [lindex $testcase 4] ", "]
+ set testcase_inits [join [lindex $testcase 5] ", "]
+ set testcase_on_error [lindex $testcase 6]
+ set testcase_bodys [lindex $testcase 7]
+ set testcase_error_level [lindex $testcase 8]
+ set testcase_bugs [lindex $testcase 9]
+ set testcase_procs [lindex $testcase 10]
+ }
}
set bug_list [list]
foreach bug $testcase_bugs {
lappend bug_list "$bug"
}
-
set bug_blurb [join $bug_list ", "]
+set proc_list [list]
+foreach proc $testcase_procs {
+ lappend proc_list "$proc"
+ }
+set proc_blurb [join $proc_list ", "]
+
template::multirow create bodys body_number body
if {[llength $testcase_bodys] == 0} {
- set testcase_desc ""
- set testcase_file ""
+ set testcase_desc ""
+ set testcase_file ""
} else {
- set body_count 0
+ set body_count 0
- #
- # Work out the URL for this directory (stripping off the file element).
- #
- set url "[ad_conn url]"
- regexp {(.*)/[^/]*} $url {\\1} url
- append url "/component?package_key=${package_key}"
-
- foreach body $testcase_bodys {
#
- # This regsub changes any "aa_call_component " so that the
- # element is a link.
+ # Work out the URL for this directory (stripping off the file element).
#
- regsub -all {aa_call_component\s+(["]?)([^\s]*)(["]?)} $body \
- "aa_call_component \\1\\2\\3" body
- template::multirow append bodys $body_count $body
- incr body_count
- }
+ set url "[ad_conn url]"
+ regexp {(.*)/[^/]*} $url {\\1} url
+ append url "/component?package_key=${package_key}"
+
+ foreach body $testcase_bodys {
+ #
+ # This regsub changes any "aa_call_component " so that the
+ # element is a link.
+ #
+ regsub -all {aa_call_component\s+(["]?)([^\s]*)(["]?)} $body \
+ "aa_call_component \\1\\2\\3" body
+ template::multirow append bodys $body_count $body
+ incr body_count
+ }
}
set resource_file_url "init-file-resource?[export_vars -url { {return_url {[ad_return_url]} } {absolute_file_path $testcase_file}}]"
set return_url [export_vars -base . { { view_by testcase } quiet { by_package_key $package_key } }]
+set quiet_url "[export_vars -base testcase -entire_form -exclude {quiet}]&quiet=1"
+set verbose_url "[export_vars -base testcase -entire_form -exclude {quiet}]&quiet=0"
+
ad_return_template