diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/functionaltests/functionaltests.c | 1 | ||||
-rw-r--r-- | tests/functionaltests/test_roster.c | 29 | ||||
-rw-r--r-- | tests/functionaltests/test_roster.h | 1 | ||||
-rw-r--r-- | tests/unittests/test_cmd_roster.c | 22 | ||||
-rw-r--r-- | tests/unittests/test_cmd_roster.h | 1 | ||||
-rw-r--r-- | tests/unittests/unittests.c | 1 |
6 files changed, 55 insertions, 0 deletions
diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c index 5e8656b7..bee95ad3 100644 --- a/tests/functionaltests/functionaltests.c +++ b/tests/functionaltests/functionaltests.c @@ -83,6 +83,7 @@ int main(int argc, char* argv[]) { PROF_FUNC_TEST(sends_new_item), PROF_FUNC_TEST(sends_new_item_nick), PROF_FUNC_TEST(sends_remove_item), + PROF_FUNC_TEST(sends_remove_item_nick), PROF_FUNC_TEST(sends_nick_change), PROF_FUNC_TEST(send_software_version_request), diff --git a/tests/functionaltests/test_roster.c b/tests/functionaltests/test_roster.c index aa06016e..c16764be 100644 --- a/tests/functionaltests/test_roster.c +++ b/tests/functionaltests/test_roster.c @@ -93,6 +93,35 @@ sends_remove_item(void **state) } void +sends_remove_item_nick(void **state) +{ + prof_connect_with_roster( + "<item jid='buddy1@localhost' name='Bobby' subscription='both'/>" + "<item jid='buddy2@localhost' subscription='both'/>" + ); + + stbbr_for_query("jabber:iq:roster", + "<iq id='*' type='set'>" + "<query xmlns='jabber:iq:roster'>" + "<item jid='buddy1@localhost' subscription='remove'/>" + "</query>" + "</iq>" + ); + + prof_input("/roster remove Bobby"); + + assert_true(stbbr_received( + "<iq type='set' id='*'>" + "<query xmlns='jabber:iq:roster'>" + "<item jid='buddy1@localhost' subscription='remove'/>" + "</query>" + "</iq>" + )); + + assert_true(prof_output_exact("Roster item removed: buddy1@localhost")); +} + +void sends_nick_change(void **state) { prof_connect_with_roster( diff --git a/tests/functionaltests/test_roster.h b/tests/functionaltests/test_roster.h index 9b34e82a..885dfc55 100644 --- a/tests/functionaltests/test_roster.h +++ b/tests/functionaltests/test_roster.h @@ -1,4 +1,5 @@ void sends_new_item(void **state); void sends_new_item_nick(void **state); void sends_remove_item(void **state); +void sends_remove_item_nick(void **state); void sends_nick_change(void **state); diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c index 3908ba58..d848235b 100644 --- a/tests/unittests/test_cmd_roster.c +++ b/tests/unittests/test_cmd_roster.c @@ -114,12 +114,34 @@ cmd_roster_remove_sends_roster_remove_request(void** state) char* jid = "bob@server.org"; gchar* args[] = { "remove", jid, NULL }; + roster_create(); + roster_add("bob@server.org", "bob", NULL, "both", FALSE); + + will_return(connection_get_status, JABBER_CONNECTED); + + expect_string(roster_send_remove, barejid, jid); + + gboolean result = cmd_roster(NULL, CMD_ROSTER, args); + assert_true(result); + roster_destroy(); +} + +void +cmd_roster_remove_nickname_sends_roster_remove_request(void** state) +{ + char* jid = "bob@server.org"; + gchar* args[] = { "remove", "bob", NULL }; + + roster_create(); + roster_add("bob@server.org", "bob", NULL, "both", FALSE); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_remove, barejid, jid); gboolean result = cmd_roster(NULL, CMD_ROSTER, args); assert_true(result); + roster_destroy(); } void diff --git a/tests/unittests/test_cmd_roster.h b/tests/unittests/test_cmd_roster.h index 49bd8db3..bc57f267 100644 --- a/tests/unittests/test_cmd_roster.h +++ b/tests/unittests/test_cmd_roster.h @@ -7,6 +7,7 @@ void cmd_roster_add_shows_message_when_no_jid(void** state); void cmd_roster_add_sends_roster_add_request(void** state); void cmd_roster_remove_shows_message_when_no_jid(void** state); void cmd_roster_remove_sends_roster_remove_request(void** state); +void cmd_roster_remove_nickname_sends_roster_remove_request(void** state); void cmd_roster_nick_shows_message_when_no_jid(void** state); void cmd_roster_nick_shows_message_when_no_nick(void** state); void cmd_roster_nick_shows_message_when_no_contact_exists(void** state); diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c index 2724aaa2..30f18c5c 100644 --- a/tests/unittests/unittests.c +++ b/tests/unittests/unittests.c @@ -584,6 +584,7 @@ main(int argc, char* argv[]) unit_test(cmd_roster_add_sends_roster_add_request), unit_test(cmd_roster_remove_shows_message_when_no_jid), unit_test(cmd_roster_remove_sends_roster_remove_request), + unit_test(cmd_roster_remove_nickname_sends_roster_remove_request), unit_test(cmd_roster_nick_shows_message_when_no_jid), unit_test(cmd_roster_nick_shows_message_when_no_nick), unit_test(cmd_roster_nick_shows_message_when_no_contact_exists), |