diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_autocomplete.c | 12 | ||||
-rw-r--r-- | tests/test_muc.c | 38 | ||||
-rw-r--r-- | tests/test_muc.h | 8 | ||||
-rw-r--r-- | tests/testsuite.c | 8 |
4 files changed, 35 insertions, 31 deletions
diff --git a/tests/test_autocomplete.c b/tests/test_autocomplete.c index 4fdd4e4d..f6ef8653 100644 --- a/tests/test_autocomplete.c +++ b/tests/test_autocomplete.c @@ -31,11 +31,12 @@ void find_after_create(void **state) void get_after_create_returns_null(void **state) { Autocomplete ac = autocomplete_new(); - GSList *result = autocomplete_get_list(ac); + GSList *result = autocomplete_create_list(ac); assert_null(result); autocomplete_clear(ac); + g_slist_free_full(result, g_free); } void add_one_and_complete(void **state) @@ -79,11 +80,12 @@ void add_two_adds_two(void **state) Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); autocomplete_add(ac, "Help"); - GSList *result = autocomplete_get_list(ac); + GSList *result = autocomplete_create_list(ac); assert_int_equal(2, g_slist_length(result)); autocomplete_clear(ac); + g_slist_free_full(result, g_free); } void add_two_same_adds_one(void **state) @@ -91,11 +93,12 @@ void add_two_same_adds_one(void **state) Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); autocomplete_add(ac, "Hello"); - GSList *result = autocomplete_get_list(ac); + GSList *result = autocomplete_create_list(ac); assert_int_equal(1, g_slist_length(result)); autocomplete_clear(ac); + g_slist_free_full(result, g_free); } void add_two_same_updates(void **state) @@ -103,7 +106,7 @@ void add_two_same_updates(void **state) Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); autocomplete_add(ac, "Hello"); - GSList *result = autocomplete_get_list(ac); + GSList *result = autocomplete_create_list(ac); GSList *first = g_slist_nth(result, 0); @@ -112,4 +115,5 @@ void add_two_same_updates(void **state) assert_string_equal("Hello", str); autocomplete_clear(ac); + g_slist_free_full(result, g_free); } diff --git a/tests/test_muc.c b/tests/test_muc.c index be7279a5..5566c17e 100644 --- a/tests/test_muc.c +++ b/tests/test_muc.c @@ -16,12 +16,12 @@ void muc_after_test(void **state) muc_close(); } -void test_muc_add_invite(void **state) +void test_muc_invites_add(void **state) { char *room = "room@conf.server"; - muc_add_invite(room); + muc_invites_add(room); - gboolean invite_exists = muc_invites_include(room); + gboolean invite_exists = muc_invites_contain(room); assert_true(invite_exists); } @@ -29,30 +29,30 @@ void test_muc_add_invite(void **state) void test_muc_remove_invite(void **state) { char *room = "room@conf.server"; - muc_add_invite(room); - muc_remove_invite(room); + muc_invites_add(room); + muc_invites_remove(room); - gboolean invite_exists = muc_invites_include(room); + gboolean invite_exists = muc_invites_contain(room); assert_false(invite_exists); } -void test_muc_invite_count_0(void **state) +void test_muc_invites_count_0(void **state) { - int invite_count = muc_invite_count(); + int invite_count = muc_invites_count(); assert_true(invite_count == 0); } -void test_muc_invite_count_5(void **state) +void test_muc_invites_count_5(void **state) { - muc_add_invite("room1@conf.server"); - muc_add_invite("room2@conf.server"); - muc_add_invite("room3@conf.server"); - muc_add_invite("room4@conf.server"); - muc_add_invite("room5@conf.server"); + muc_invites_add("room1@conf.server"); + muc_invites_add("room2@conf.server"); + muc_invites_add("room3@conf.server"); + muc_invites_add("room4@conf.server"); + muc_invites_add("room5@conf.server"); - int invite_count = muc_invite_count(); + int invite_count = muc_invites_count(); assert_true(invite_count == 5); } @@ -61,18 +61,18 @@ void test_muc_room_is_not_active(void **state) { char *room = "room@server.org"; - gboolean room_is_active = muc_room_is_active(room); + gboolean room_is_active = muc_active(room); assert_false(room_is_active); } -void test_muc_room_is_active(void **state) +void test_muc_active(void **state) { char *room = "room@server.org"; char *nick = "bob"; - muc_join_room(room, nick, NULL, FALSE); + muc_join(room, nick, NULL, FALSE); - gboolean room_is_active = muc_room_is_active(room); + gboolean room_is_active = muc_active(room); assert_true(room_is_active); } diff --git a/tests/test_muc.h b/tests/test_muc.h index 044d547d..8df54a5d 100644 --- a/tests/test_muc.h +++ b/tests/test_muc.h @@ -1,9 +1,9 @@ void muc_before_test(void **state); void muc_after_test(void **state); -void test_muc_add_invite(void **state); +void test_muc_invites_add(void **state); void test_muc_remove_invite(void **state); -void test_muc_invite_count_0(void **state); -void test_muc_invite_count_5(void **state); +void test_muc_invites_count_0(void **state); +void test_muc_invites_count_5(void **state); void test_muc_room_is_not_active(void **state); -void test_muc_room_is_active(void **state); +void test_muc_active(void **state); diff --git a/tests/testsuite.c b/tests/testsuite.c index 3441ceb9..1dcabe73 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -419,12 +419,12 @@ int main(int argc, char* argv[]) { load_preferences, close_preferences), - unit_test_setup_teardown(test_muc_add_invite, muc_before_test, muc_after_test), + unit_test_setup_teardown(test_muc_invites_add, muc_before_test, muc_after_test), unit_test_setup_teardown(test_muc_remove_invite, muc_before_test, muc_after_test), - unit_test_setup_teardown(test_muc_invite_count_0, muc_before_test, muc_after_test), - unit_test_setup_teardown(test_muc_invite_count_5, muc_before_test, muc_after_test), + unit_test_setup_teardown(test_muc_invites_count_0, muc_before_test, muc_after_test), + unit_test_setup_teardown(test_muc_invites_count_5, muc_before_test, muc_after_test), unit_test_setup_teardown(test_muc_room_is_not_active, muc_before_test, muc_after_test), - unit_test_setup_teardown(test_muc_room_is_active, muc_before_test, muc_after_test), + unit_test_setup_teardown(test_muc_active, muc_before_test, muc_after_test), unit_test(cmd_bookmark_shows_message_when_disconnected), unit_test(cmd_bookmark_shows_message_when_disconnecting), |