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 -r1.40.6.1 -r1.40.6.2 --- openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 23 Sep 2013 12:24:16 -0000 1.40.6.1 +++ openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 29 Sep 2013 14:55:33 -0000 1.40.6.2 @@ -866,7 +866,7 @@ set string_with_img {} aa_log "Original string is $string_with_img" set html_version [ad_enhanced_text_to_html $string_with_img] - aa_true "new: $html_version should be the same" [string equal $html_version $string_with_img] + aa_equals "new: $html_version should be the same" $html_version $string_with_img } aa_register_case -cats {api db} db__caching { @@ -1035,7 +1035,9 @@ set parameter_id [db_nextval "acs_object_id_seq"] apm_parameter_register -parameter_id $parameter_id -scope global x_test_x "" acs-tcl 0 number parameter::set_global_value -package_key acs-tcl -parameter x_test_x -value 3 - aa_true "check global parameter value set/get" [string equal [parameter::get_global_value -package_key acs-tcl -parameter x_test_x] 3] + aa_equals "check global parameter value set/get" \ + [parameter::get_global_value -package_key acs-tcl -parameter x_test_x]\ + "3" apm_parameter_unregister $parameter_id foreach tuple [db_list_of_lists get_param { @@ -1061,26 +1063,31 @@ }] aa_log "$package_key $parameter_name $actual_value" - aa_true "check parameter::get" [string equal [parameter::get -package_id $package_id -parameter $parameter_name] $actual_value] - aa_true "check parameter::get_from_package_key" \ - [string equal [parameter::get_from_package_key -package_key $package_key -parameter $parameter_name] $actual_value] + aa_equals "check parameter::get" \ + [parameter::get -package_id $package_id -parameter $parameter_name] \ + $actual_value + aa_equals "check parameter::get_from_package_key" \ + [parameter::get_from_package_key -package_key $package_key -parameter $parameter_name] \ + $actual_value parameter::set_default -package_key $package_key -parameter $parameter_name -value $value set value_db [db_string get_values { select default_value from apm_parameters where package_key = :package_key and parameter_name = :parameter_name }] - aa_true "check parameter::set_default" [string equal $value $value_db] + aa_equals "check parameter::set_default" $value $value_db set value [expr {$value + 10}] parameter::set_from_package_key -package_key $package_key -parameter $parameter_name -value $value - aa_true "check parameter::set_from_package_key" \ - [string equal $value [parameter::get -package_id $package_id -parameter $parameter_name]] + aa_equals "check parameter::set_from_package_key" \ + [parameter::get -package_id $package_id -parameter $parameter_name] \ + $value set value [expr {$value + 10}] parameter::set_value -package_id $package_id -parameter $parameter_name -value $value - aa_true "check parameter::set_value" \ - [string equal $value [parameter::get -package_id $package_id -parameter $parameter_name]] + aa_equals "check parameter::set_value" \ + [parameter::get -package_id $package_id -parameter $parameter_name] \ + $value ad_parameter_cache -delete $package_id $parameter_name @@ -1098,7 +1105,7 @@ # Retrieve an objects_package_id set object_id [db_string get_object_id "select max(object_id) from acs_objects where package_id >0"] set package_id [db_string get_package_id "select package_id from acs_objects where object_id = :object_id"] - aa_true "package_id returned is correct" [string equal $package_id [acs_object::package_id -object_id $object_id]] + aa_equals "package_id returned is correct" $package_id [acs_object::package_id -object_id $object_id] } aa_register_case -cats {api smoke} acs_user__registered_user_p {