Index: openacs-4/packages/acs-tcl/tcl/test/whos-online-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/whos-online-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-tcl/tcl/test/whos-online-procs.tcl 19 Jul 2018 11:43:19 -0000 1.8 +++ openacs-4/packages/acs-tcl/tcl/test/whos-online-procs.tcl 25 Jul 2018 13:42:48 -0000 1.9 @@ -5,17 +5,18 @@ @creation-date 2006-08-02 } -aa_register_case -cats { - smoke production_safe web -} -libraries tclwebtest -procs { - whos_online::num_users - whos_online::set_invisible - whos_online::all_invisible_user_ids - whos_online::unset_invisible - whos_online::user_ids -} whos_online__check_online_visibility { - Check procs related with users online visibility -} { +aa_register_case \ + -cats { smoke production_safe web } \ + -procs { + whos_online::num_users + whos_online::set_invisible + whos_online::all_invisible_user_ids + whos_online::unset_invisible + whos_online::user_ids + } whos_online__check_online_visibility { + + Check procs related with users online visibility + } { set user_id [db_nextval acs_object_id_seq] @@ -29,52 +30,51 @@ aa_log "Logged users: $logged_users" # Login user - array set user_info [twt::user::create -admin -user_id $user_id] - twt::user::login $user_info(email) $user_info(password) - + set user_info [acs::test::user::create -admin -user_id $user_id] + + set d [acs::test::http -user_id $user_id /] + set logged_users [whos_online::num_users] aa_true "New user logged - Users logged: $logged_users" { $logged_users > 0 } #--------------------------------------------------------------------------------------------------- #Test set_invisible #--------------------------------------------------------------------------------------------------- - aa_log "User $user_info(email) is visible" + aa_log "User [dict get $user_info email] is visible" whos_online::set_invisible $user_id - aa_true "User $user_info(email) is Invisible" {[nsv_exists invisible_users $user_id] == 1 } + aa_true "User [dict get $user_info email] is Invisible" {[nsv_exists invisible_users $user_id] == 1 } #--------------------------------------------------------------------------------------------------- #Test all-invisible_user_ids #--------------------------------------------------------------------------------------------------- - aa_true "User $user_info(email) with user_id=$user_id is in the invisible list" \ + aa_true "User [dict get $user_info email] user_id $user_id is in the invisible list ([whos_online::all_invisible_user_ids])" \ {$user_id in [whos_online::all_invisible_user_ids]} #--------------------------------------------------------------------------------------------------- #Test unset_invisible #--------------------------------------------------------------------------------------------------- - aa_log "User $user_info(email) is invisible" + aa_log "User [dict get $user_info email] is invisible" whos_online::unset_invisible $user_id - aa_false "User $user_info(email) is Visible" \ + aa_false "User [dict get $user_info email] is Visible" \ {[whos_online::user_invisible_p $user_id ] == 1 } #--------------------------------------------------------------------------------------------------- #Test user_ids #--------------------------------------------------------------------------------------------------- - aa_true "User $user_info(email) with user_id=$user_id is in the visible list" \ + aa_true "User [dict get $user_info email] user_id $user_id is in the visible list ([whos_online::user_ids])" \ {$user_id in [whos_online::user_ids]} - twt::user::logout - twt::user::delete -user_id $user_id } -teardown_code { - twt::user::delete -user_id $user_id + acs::test::user::delete -user_id $user_id } }