diff --git a/stabbertests/stabbertestsuite.c b/stabbertests/stabbertestsuite.c index 55affa2a..906a1031 100644 --- a/stabbertests/stabbertestsuite.c +++ b/stabbertests/stabbertestsuite.c @@ -31,9 +31,9 @@ int main(int argc, char* argv[]) { unit_test_setup_teardown(connect_bad_password, init_prof_test, close_prof_test), -// unit_test_setup_teardown(show_presence_updates, -// init_prof_test, -// close_prof_test), + unit_test_setup_teardown(show_presence_updates, + init_prof_test, + close_prof_test), // unit_test_setup_teardown(sends_rooms_iq, // init_prof_test, // close_prof_test), diff --git a/stabbertests/test_connect.c b/stabbertests/test_connect.c index b8f1a1a6..7e29469d 100644 --- a/stabbertests/test_connect.c +++ b/stabbertests/test_connect.c @@ -84,56 +84,41 @@ connect_bad_password(void **state) assert_true(prof_output("Login failed.")); } -//void -//show_presence_updates(void **state) -//{ -// will_return(ui_ask_password, strdup("password")); -// expect_any_cons_show(); -// -// stbbr_for("roster", -// "" -// "" -// "" -// "" -// "" -// "" -// ); -// -// cmd_process_input(strdup("/connect stabber@localhost port 5230")); -// prof_process_xmpp(20); -// -// stbbr_send( -// "" -// "dnd" -// "busy!" -// "" -// "" -// "chat" -// "Talk to me!" -// "" -// "" -// "away" -// "Out of office" -// "" -// ); -// -// Resource *resource1 = resource_new("mobile", RESOURCE_DND, "busy!", 0); -// expect_string(ui_contact_online, barejid, "buddy1@localhost"); -// expect_check(ui_contact_online, resource, (CheckParameterValue)resource_equal_check, resource1); -// expect_value(ui_contact_online, last_activity, NULL); -// -// Resource *resource2 = resource_new("laptop", RESOURCE_CHAT, "Talk to me!", 0); -// expect_string(ui_contact_online, barejid, "buddy1@localhost"); -// expect_check(ui_contact_online, resource, (CheckParameterValue)resource_equal_check, resource2); -// expect_value(ui_contact_online, last_activity, NULL); -// -// Resource *resource3 = resource_new("work", RESOURCE_AWAY, "Out of office", 0); -// expect_string(ui_contact_online, barejid, "buddy2@localhost"); -// expect_check(ui_contact_online, resource, (CheckParameterValue)resource_equal_check, resource3); -// expect_value(ui_contact_online, last_activity, NULL); -// -// prof_process_xmpp(20); -//} +void +show_presence_updates(void **state) +{ + stbbr_for("roster", + "" + "" + "" + "" + "" + "" + ); + + prof_input("/connect stabber@localhost port 5230"); + prof_input("password"); + assert_true(prof_output("stabber@localhost logged in successfully")); + + stbbr_send( + "" + "dnd" + "busy!" + "" + "" + "chat" + "Talk to me!" + "" + "" + "away" + "Out of office" + "" + ); + + assert_true(prof_output("Buddy1 (mobile) is dnd")); + assert_true(prof_output("Buddy1 (laptop) is chat")); + assert_true(prof_output("Buddy2 (work) is away")); +} // //void //sends_rooms_iq(void **state) diff --git a/stabbertests/test_connect.h b/stabbertests/test_connect.h index a8795399..a6078078 100644 --- a/stabbertests/test_connect.h +++ b/stabbertests/test_connect.h @@ -3,7 +3,7 @@ void connect_jid_requests_roster(void **state); void connect_jid_sends_presence_after_receiving_roster(void **state); void connect_jid_requests_bookmarks(void **state); void connect_bad_password(void **state); -//void show_presence_updates(void **state); +void show_presence_updates(void **state); //void sends_rooms_iq(void **state); //void multiple_pings(void **state); //void responds_to_ping(void **state);