Index: openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl 17 Feb 2004 15:21:51 -0000 1.18 +++ openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl 10 Jan 2007 21:22:01 -0000 1.19 @@ -51,7 +51,7 @@ # End job array set job [auth::sync::job::end -job_id $job_id] - aa_true "Elapsed time less than 30 seconds" [expr $job(run_time_seconds) < 30] + aa_true "Elapsed time less than 30 seconds" [expr {$job(run_time_seconds) < 30}] aa_log "Elapsed time: $job(run_time_seconds) seconds" @@ -61,7 +61,7 @@ aa_equals "Number of problems" $job(num_problems) 1 - aa_false "Log URL non-empty" [empty_string_p $job(log_url)] + aa_false "Log URL non-empty" [expr {$job(log_url) eq ""}] # Purge not deleting the job auth::sync::purge_jobs \ @@ -323,15 +323,15 @@ array set job [auth::sync::job::end -job_id $job_id] - aa_true "Elapsed time less than 30 seconds" [expr $job(run_time_seconds) < 30] + aa_true "Elapsed time less than 30 seconds" [expr {$job(run_time_seconds) < 30}] aa_false "Not interactive" [template::util::is_true $job(interactive_p)] aa_equals "Number of actions" $job(num_actions) 6 aa_equals "Number of problems" $job(num_problems) 2 - aa_false "Log URL non-empty" [empty_string_p $job(log_url)] + aa_false "Log URL non-empty" [expr {$job(log_url) eq ""}] } } @@ -465,15 +465,15 @@ array set job [auth::sync::job::end -job_id $job_id] - aa_true "Elapsed time less than 30 seconds" [expr $job(run_time_seconds) < 30] + aa_true "Elapsed time less than 30 seconds" [expr {$job(run_time_seconds) < 30}] aa_false "Not interactive" [template::util::is_true $job(interactive_p)] - aa_equals "Number of actions" $job(num_actions) [expr $num_users_not_banned + 1] + aa_equals "Number of actions" $job(num_actions) [expr {$num_users_not_banned + 1}] aa_equals "Number of problems" $job(num_problems) 0 - aa_false "Log URL non-empty" [empty_string_p $job(log_url)] + aa_false "Log URL non-empty" [expr {$job(log_url) eq ""}] } } @@ -502,7 +502,7 @@ aa_stub acs_sc::invoke { acs_sc::invoke__arg_parser - if { [string equal $contract "auth_sync_retrieve"] && [string equal $operation "GetDocument"] } { + if { $contract eq "auth_sync_retrieve" && $operation eq "GetDocument" } { array set result { doc_status ok doc_message {} @@ -665,10 +665,10 @@ aa_true "email has a problem (email missing)" [util_sets_equal_p { email } [array names elm_msgs]] } update { - aa_true "User does not exist" [expr ![empty_string_p $entry(message)]] + aa_true "User does not exist" [expr {$entry(message) ne ""}] } delete { - aa_false "Message is not empty" [empty_string_p $entry(message)] + aa_false "Message is not empty" [expr {$entry(message) eq ""}] } } } @@ -685,7 +685,7 @@ aa_stub acs_sc::invoke { acs_sc::invoke__arg_parser - if { [string equal $contract "auth_sync_retrieve"] && [string equal $operation "GetDocument"] } { + if { $contract eq "auth_sync_retrieve" && $operation eq "GetDocument" } { array set result { doc_status ok doc_message {} @@ -957,7 +957,7 @@ aa_equals "result.doc_status is ok" $result(doc_status) "ok" - aa_true "result.doc_message is empty" [empty_string_p $result(doc_message)] + aa_true "result.doc_message is empty" [expr {$result(doc_message) eq ""}] aa_equals "result.document is 'success'" $result(document) "success" } @@ -976,6 +976,6 @@ -call_args [list [list SnapshotPath {} IncrementalPath $path]]] aa_equals "result.doc_status is ok" $result(doc_status) "ok" - aa_true "result.doc_message is empty" [empty_string_p $result(doc_message)] + aa_true "result.doc_message is empty" [expr {$result(doc_message) eq ""}] aa_equals "result.document is 'success'" $result(document) [template::util::read_file $path] }