From 609d05366c00670c176c842a19be760ad54f384b Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 20 Nov 2016 02:09:34 +0000 Subject: Use server features for account muc service issue #878 --- tests/functionaltests/functionaltests.c | 1 - tests/functionaltests/test_muc.c | 15 --------------- tests/functionaltests/test_muc.h | 1 - tests/functionaltests/test_rooms.c | 2 +- tests/unittests/config/stub_accounts.c | 1 + 5 files changed, 2 insertions(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c index 617ab838..ef9f0e39 100644 --- a/tests/functionaltests/functionaltests.c +++ b/tests/functionaltests/functionaltests.c @@ -89,7 +89,6 @@ int main(int argc, char* argv[]) { PROF_FUNC_TEST(display_software_version_result_in_chat), PROF_FUNC_TEST(sends_room_join), - PROF_FUNC_TEST(sends_room_join_with_default_muc_service), PROF_FUNC_TEST(sends_room_join_with_nick), PROF_FUNC_TEST(sends_room_join_with_password), PROF_FUNC_TEST(sends_room_join_with_nick_and_password), diff --git a/tests/functionaltests/test_muc.c b/tests/functionaltests/test_muc.c index 5a117045..e7fc8dcb 100644 --- a/tests/functionaltests/test_muc.c +++ b/tests/functionaltests/test_muc.c @@ -26,21 +26,6 @@ sends_room_join(void **state) )); } -void -sends_room_join_with_default_muc_service(void **state) -{ - prof_connect(); - - prof_input("/join testroom"); - - assert_true(stbbr_last_received( - "" - "" - "" - "" - )); -} - void sends_room_join_with_nick(void **state) { diff --git a/tests/functionaltests/test_muc.h b/tests/functionaltests/test_muc.h index 30a6c2c8..4f3c4f5d 100644 --- a/tests/functionaltests/test_muc.h +++ b/tests/functionaltests/test_muc.h @@ -1,5 +1,4 @@ void sends_room_join(void **state); -void sends_room_join_with_default_muc_service(void **state); void sends_room_join_with_nick(void **state); void sends_room_join_with_password(void **state); void sends_room_join_with_nick_and_password(void **state); diff --git a/tests/functionaltests/test_rooms.c b/tests/functionaltests/test_rooms.c index 9bff2e19..c0103279 100644 --- a/tests/functionaltests/test_rooms.c +++ b/tests/functionaltests/test_rooms.c @@ -25,7 +25,7 @@ rooms_query(void **state) prof_connect(); - prof_input("/rooms"); + prof_input("/rooms conference.localhost"); assert_true(prof_output_exact("chatroom@conference.localhost, (A chat room)")); assert_true(prof_output_exact("hangout@conference.localhost, (Another chat room)")); diff --git a/tests/unittests/config/stub_accounts.c b/tests/unittests/config/stub_accounts.c index 4c0449d6..669ceb33 100644 --- a/tests/unittests/config/stub_accounts.c +++ b/tests/unittests/config/stub_accounts.c @@ -196,6 +196,7 @@ void accounts_clear_otr(const char * const account_name) {} void accounts_clear_pgp_keyid(const char * const account_name) {} void accounts_clear_script_start(const char * const account_name) {} void accounts_clear_theme(const char * const account_name) {} +void accounts_clear_muc(const char * const account_name) {} void accounts_add_otr_policy(const char * const account_name, const char * const contact_jid, const char * const policy) {} char* accounts_get_last_activity(const char *const account_name) { -- cgit 1.4.1-2-gfad0