Index: openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl,v diff -u -N -r1.71.2.17 -r1.71.2.18 --- openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 2 Sep 2019 16:56:18 -0000 1.71.2.17 +++ openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 3 Sep 2019 06:35:55 -0000 1.71.2.18 @@ -1415,16 +1415,12 @@ @author Hanifa Hasan } { - aa_run_with_teardown \ - -rollback \ - -test_code { - set cases {1 one 2 two 3 three 4 four 5 five 546356 423654 sdgvlrjnevclme sdlgtmsdgvsdf} - set cases_complete [concat $cases "Unknown"] - dict for {case result} $cases { - aa_equals "ad_decode $case $cases_complete return $result" "$result" [ad_decode $case {*}$cases_complete] - } - aa_equals "ad_decode gibberish $cases_complete return Unknown" "Unknown" [ad_decode gibberish {*}$cases_complete] - } + set cases {1 one 2 two 3 three 4 four 5 five 546356 423654 sdgvlrjnevclme sdlgtmsdgvsdf} + set cases_complete [concat $cases "Unknown"] + dict for {case result} $cases { + aa_equals "ad_decode $case $cases_complete return $result" "$result" [ad_decode $case {*}$cases_complete] + } + aa_equals "ad_decode gibberish $cases_complete return Unknown" "Unknown" [ad_decode gibberish {*}$cases_complete] } aa_register_case \ @@ -1436,16 +1432,12 @@ @author Hanifa Hasan } { - aa_run_with_teardown \ - -rollback \ - -test_code { - set convert_seconds {6344 "1h 45m 44s" 433 "7m 13s" 5556 "1h 32m 36s" 234 "3m 54s" 23 "23s" 604800 "168h 0m 0s"} - dict for {seconds result} $convert_seconds { - aa_true "util::interval_pretty $seconds return $result " {[util::interval_pretty -seconds $seconds] eq $result } - } - aa_equals "Empty seconds" [util::interval_pretty -seconds ""] "" - aa_equals "No arguments" [util::interval_pretty] "" - } + set convert_seconds {6344 "1h 45m 44s" 433 "7m 13s" 5556 "1h 32m 36s" 234 "3m 54s" 23 "23s" 604800 "168h 0m 0s"} + dict for {seconds result} $convert_seconds { + aa_true "util::interval_pretty $seconds return $result " {[util::interval_pretty -seconds $seconds] eq $result } + } + aa_equals "Empty seconds" [util::interval_pretty -seconds ""] "" + aa_equals "No arguments" [util::interval_pretty] "" } # Local variables: