Index: openacs-4/packages/acs-automated-testing/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-automated-testing/www/admin/index.tcl 16 Feb 2004 16:47:28 -0000 1.5
+++ openacs-4/packages/acs-automated-testing/www/admin/index.tcl 24 Feb 2005 22:10:51 -0000 1.6
@@ -41,9 +41,9 @@
set packages($package_key) [list 0 0 0]
}
-db_foreach acs-automated-testing.results_query {
+db_foreach acs-automated-testing.results_queryx {
select testcase_id, package_key,
- to_char(timestamp,'DD-MM-YYYY HH24:MI:SS') timestamp, passes, fails
+ to_char(timestamp,'YYYY-MM-DD_HH24:MI:SS') as timestamp, passes, fails
from aa_test_final_results
} {
if {[info exists results("$testcase_id,$package_key")]} {
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-automated-testing/www/admin/testcase-oracle.xql 11 Feb 2003 11:06:07 -0000 1.2
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase-oracle.xql 24 Feb 2005 22:10:51 -0000 1.3
@@ -5,11 +5,12 @@
- select to_char(timestamp,'DD/MM/YYYY HH: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,'YYYY-MM-DD HH24:MI:SS') as timestamp, result, notes
+ from aa_test_results
+ where testcase_id = :testcase_id
+ and package_key = :package_key
+ $filter
+ order by test_id
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-automated-testing/www/admin/testcase-postgresql.xql 11 Nov 2001 18:03:52 -0000 1.1
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase-postgresql.xql 24 Feb 2005 22:10:51 -0000 1.2
@@ -5,11 +5,12 @@
- select 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,'YYYY-MM-DD HH24:MI:SS') as timestamp, result, notes
+ from aa_test_results
+ where testcase_id = :testcase_id
+ and package_key = :package_key
+ $filter
+ order by test_id
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.adp 16 Feb 2004 14:03:45 -0000 1.11
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.adp 24 Feb 2005 22:10:51 -0000 1.12
@@ -1,140 +1,129 @@
-@title;noquote@
-@context;noquote@
+ @title;noquote@ (@package_key@)
+ @context;noquote@
+
+
+
-
-
-
- Testcase @testcase_id@ (@package_key@)
-
- Description:@testcase_desc@
- Defined in file:@testcase_file@
- Categories:@testcase_cats@
-
- Bugs:This test case covers OpenACS bug number(s):
- @bug_blurb;noquote@
-
-
- Procs:This test case covers OpenACS proc(s):
- @proc_blurb;noquote@
-
-
- Initialisation Classes:@testcase_inits@
-
-
- Testcase failure error response:
- @testcase_on_error@
-
-
-
- Body @bodys.body_number@ source
-
- @bodys.body@
-
-
-
-
- |
+
+
+ - Description:
- @testcase_desc@
+ - Defined in file:
- @testcase_file@
+ - Categories:
- @testcase_cats@
+
+ - Bugs:
- This test case covers OpenACS bug number(s):
+ @bug_blurb;noquote@
+
+
+ - Procs:
- This test case covers OpenACS proc(s):
+ @proc_blurb;noquote@
+
+
+ - Initialisation Classes:
- @testcase_inits@
+
+
+ - Testcase failure error response:
+ - @testcase_on_error;noquote@
+
+
+
+ - Body @bodys.body_number@ source
+ @bodys.body@
+
- »
- Rerun this test case
-
- »
- Resource test definition file
-
- »
- Back to testcase list
-
+
+
+
+ Results
+ [
+ quiet |
+ verbose
+
+ quiet
+ | verbose
+ ]
+
-
-Results
-[
- quiet |
- verbose
-
- quiet
- | verbose
-]
-
-
-
- | Time |
- Result |
- Notes |
-
|---|
-
- | No results |
-
-
-
-
-
-
-
-
-
-
- | @tests.timestamp@ |
-
-
- FAILED
-
-
- log
-
-
- passed
-
-
-
-
-
- @tests.result@
-
- |
- @tests.notes@ |
-
-
-
-
-
-
-
-
| Result |
Count |
+
+ | @tests_quiet.result@ |
+ @tests_quiet.count@ |
+
+
+
+
+
- | @tests_quiet.result@ |
- @tests_quiet.count@ |
+ Time |
+ Result |
+ Notes |
-
+
+ | No results |
+
+
+
+
+
+
+
+
+
+
+ | @tests.timestamp@ |
+
+ FAILED |
+
+
+ @tests.result@ |
+
+ @tests.notes@ |
+
+
+
-
-
- »
- Rerun this test case
-
- »
- Resource test definition file
-
- »
- Back to testcase list
-
-
-
+
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.7 -r1.8
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl 16 Feb 2004 14:03:45 -0000 1.7
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl 24 Feb 2005 22:10:51 -0000 1.8
@@ -4,7 +4,7 @@
testcase_id:nohtml
package_key:nohtml
{showsource 0}
- {quiet 0}
+ {quiet 1}
} -properties {
title:onevalue
context_bar:onevalue
@@ -20,25 +20,23 @@
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
-} {
- if { ![info exists test_count($result)] } {
- set test_count($result) 1
- } else {
- incr test_count($result)
- }
+if {$quiet} {
+ set filter { and result = 'fail'}
+} else {
+ set filter {}
}
-multirow create tests_quiet result count
-foreach result [array names test_count] {
- multirow append tests_quiet $result $test_count($result)
+db_multirow tests_quiet summary {
+ select result, count(*) as count
+ from aa_test_results
+ where testcase_id = :testcase_id
+ and package_key = :package_key
+ group by result
}
+
+db_multirow tests acs-automated-testing.testcase_query {}
+
if {![db_0or1row acs-automated-testing.get_testcase_fails_count {
select fails
from aa_test_final_results