From 768b2aa4667a362ea1343f47c044d79b642c2497 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 29 Oct 2012 22:55:17 +0000 Subject: Fixed tests --- tests/test_prof_autocomplete.c | 217 ----------------------------------------- 1 file changed, 217 deletions(-) (limited to 'tests/test_prof_autocomplete.c') diff --git a/tests/test_prof_autocomplete.c b/tests/test_prof_autocomplete.c index 895a4a44..b61c9cf6 100644 --- a/tests/test_prof_autocomplete.c +++ b/tests/test_prof_autocomplete.c @@ -13,16 +13,6 @@ static void clear_empty(void) p_autocomplete_clear(ac); } -static void clear_empty_with_free_func(void) -{ - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - p_autocomplete_clear(ac); -} - static void reset_after_create(void) { PAutocomplete ac = p_autocomplete_new(); @@ -47,20 +37,6 @@ static void get_after_create_returns_null(void) p_autocomplete_clear(ac); } -static void get_after_create_with_copy_func_returns_null(void) -{ - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - GSList *result = p_autocomplete_get_list(ac); - - assert_is_null(result); - - p_autocomplete_clear(ac); -} - static void add_one_and_complete(void) { char *item = strdup("Hello"); @@ -73,22 +49,6 @@ static void add_one_and_complete(void) p_autocomplete_clear(ac); } -static void add_one_and_complete_with_funcs(void) -{ - PContact contact = p_contact_new("James", "Online", "I'm here"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - p_autocomplete_add(ac, contact); - char *result = p_autocomplete_complete(ac, "Jam"); - - assert_string_equals("James", result); - - p_autocomplete_clear(ac); -} - static void add_two_and_complete_returns_first(void) { char *item1 = strdup("Hello"); @@ -103,24 +63,6 @@ static void add_two_and_complete_returns_first(void) p_autocomplete_clear(ac); } -static void add_two_and_complete_returns_first_with_funcs(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("Jamie", "Away", "Out to lunch"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - p_autocomplete_add(ac, contact1); - p_autocomplete_add(ac, contact2); - char *result = p_autocomplete_complete(ac, "Jam"); - - assert_string_equals("James", result); - - p_autocomplete_clear(ac); -} - static void add_two_and_complete_returns_second(void) { char *item1 = strdup("Hello"); @@ -136,25 +78,6 @@ static void add_two_and_complete_returns_second(void) p_autocomplete_clear(ac); } -static void add_two_and_complete_returns_second_with_funcs(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("Jamie", "Away", "Out to lunch"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - p_autocomplete_add(ac, contact1); - p_autocomplete_add(ac, contact2); - char *result1 = p_autocomplete_complete(ac, "Jam"); - char *result2 = p_autocomplete_complete(ac, result1); - - assert_string_equals("Jamie", result2); - - p_autocomplete_clear(ac); -} - static void add_two_adds_two(void) { char *item1 = strdup("Hello"); @@ -169,24 +92,6 @@ static void add_two_adds_two(void) p_autocomplete_clear(ac); } -static void add_two_adds_two_with_funcs(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("Jamie", "Away", "Out to lunch"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - p_autocomplete_add(ac, contact1); - p_autocomplete_add(ac, contact2); - GSList *result = p_autocomplete_get_list(ac); - - assert_int_equals(2, g_slist_length(result)); - - p_autocomplete_clear(ac); -} - static void add_two_same_adds_one(void) { char *item1 = strdup("Hello"); @@ -201,24 +106,6 @@ static void add_two_same_adds_one(void) p_autocomplete_clear(ac); } -static void add_two_same_adds_one_with_funcs(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("James", "Away", "Out to lunch"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - p_autocomplete_add(ac, contact1); - p_autocomplete_add(ac, contact2); - GSList *result = p_autocomplete_get_list(ac); - - assert_int_equals(1, g_slist_length(result)); - - p_autocomplete_clear(ac); -} - static void add_two_same_updates(void) { char *item1 = strdup("Hello"); @@ -237,29 +124,6 @@ static void add_two_same_updates(void) p_autocomplete_clear(ac); } -static void add_two_same_updates_with_funcs(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("James", "Away", "Out to lunch"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - p_autocomplete_add(ac, contact1); - p_autocomplete_add(ac, contact2); - GSList *result = p_autocomplete_get_list(ac); - - GSList *first = g_slist_nth(result, 0); - PContact contact = first->data; - - assert_string_equals("James", p_contact_name(contact)); - assert_string_equals("Away", p_contact_show(contact)); - assert_string_equals("Out to lunch", p_contact_status(contact)); - - p_autocomplete_clear(ac); -} - static void add_one_returns_true(void) { char *item = strdup("Hello"); @@ -271,21 +135,6 @@ static void add_one_returns_true(void) p_autocomplete_clear(ac); } -static void add_one_returns_true_with_funcs(void) -{ - PContact contact = p_contact_new("James", "Online", "I'm here"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - int result = p_autocomplete_add(ac, contact); - - assert_true(result); - - p_autocomplete_clear(ac); -} - static void add_two_different_returns_true(void) { char *item1 = strdup("Hello"); @@ -300,24 +149,6 @@ static void add_two_different_returns_true(void) p_autocomplete_clear(ac); } -static void add_two_different_returns_true_with_funcs(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("JamesB", "Away", "Out to lunch"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - int result1 = p_autocomplete_add(ac, contact1); - int result2 = p_autocomplete_add(ac, contact2); - - assert_true(result1); - assert_true(result2); - - p_autocomplete_clear(ac); -} - static void add_two_same_returns_false(void) { char *item1 = strdup("Hello"); @@ -332,68 +163,20 @@ static void add_two_same_returns_false(void) p_autocomplete_clear(ac); } -static void add_two_same_returns_false_with_funcs(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("James", "Online", "I'm here"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - int result1 = p_autocomplete_add(ac, contact1); - int result2 = p_autocomplete_add(ac, contact2); - - assert_true(result1); - assert_false(result2); - - p_autocomplete_clear(ac); -} - -static void add_two_same_different_data_returns_true(void) -{ - PContact contact1 = p_contact_new("James", "Online", "I'm here"); - PContact contact2 = p_contact_new("James", "Away", "I'm not here right now"); - PAutocomplete ac = - p_obj_autocomplete_new((PStrFunc)p_contact_name, - (PCopyFunc)p_contact_copy, - (PEqualDeepFunc)p_contacts_equal_deep, - (GDestroyNotify)p_contact_free); - int result1 = p_autocomplete_add(ac, contact1); - int result2 = p_autocomplete_add(ac, contact2); - - assert_true(result1); - assert_true(result2); - - p_autocomplete_clear(ac); -} - void register_prof_autocomplete_tests(void) { TEST_MODULE("prof_autocomplete tests"); TEST(clear_empty); - TEST(clear_empty_with_free_func); TEST(reset_after_create); TEST(find_after_create); TEST(get_after_create_returns_null); - TEST(get_after_create_with_copy_func_returns_null); TEST(add_one_and_complete); - TEST(add_one_and_complete_with_funcs); TEST(add_two_and_complete_returns_first); - TEST(add_two_and_complete_returns_first_with_funcs); TEST(add_two_and_complete_returns_second); - TEST(add_two_and_complete_returns_second_with_funcs); TEST(add_two_adds_two); - TEST(add_two_adds_two_with_funcs); TEST(add_two_same_adds_one); - TEST(add_two_same_adds_one_with_funcs); TEST(add_two_same_updates); - TEST(add_two_same_updates_with_funcs); TEST(add_one_returns_true); - TEST(add_one_returns_true_with_funcs); TEST(add_two_different_returns_true); - TEST(add_two_different_returns_true_with_funcs); TEST(add_two_same_returns_false); - TEST(add_two_same_returns_false_with_funcs); - TEST(add_two_same_different_data_returns_true); } -- cgit 1.4.1-2-gfad0