devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Revert "Apply coding style"

Browse Source 
This reverts commit 9b55f2dec0.

Sorting the includes creates some problems.
This commit is contained in:
Michael Vetter
2020-07-07 13:53:30 +02:00
parent 28fde3cd01
commit a4cadf78fa
214 changed files with 17576 additions and 19566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

246
tests/unittests/test_roster_list.c
View File

@@ -1,43 +1,40 @@
#include <cmocka.h>
#include <glib.h>
#include <setjmp.h>
#include <stdarg.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
#include <setjmp.h>
#include <cmocka.h>
#include <stdlib.h>
#include "xmpp/contact.h"
#include "xmpp/roster_list.h"
void
empty_list_when_none_added(void** state)
void empty_list_when_none_added(void **state)
{
roster_create();
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
assert_null(list);
g_slist_free(list);
roster_destroy();
}
void
contains_one_element(void** state)
void contains_one_element(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
assert_int_equal(1, g_slist_length(list));
g_slist_free(list);
roster_destroy();
}
void
first_element_correct(void** state)
void first_element_correct(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
PContact james = list->data;
assert_string_equal("James", p_contact_barejid(james));
@@ -46,13 +43,12 @@ first_element_correct(void** state)
roster_destroy();
}
void
contains_two_elements(void** state)
void contains_two_elements(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
assert_int_equal(2, g_slist_length(list));
@@ -60,13 +56,12 @@ contains_two_elements(void** state)
roster_destroy();
}
void
first_and_second_elements_correct(void** state)
void first_and_second_elements_correct(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
PContact first = list->data;
PContact second = (g_slist_next(list))->data;
@@ -78,14 +73,13 @@ first_and_second_elements_correct(void** state)
roster_destroy();
}
void
contains_three_elements(void** state)
void contains_three_elements(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
assert_int_equal(3, g_slist_length(list));
@@ -93,14 +87,13 @@ contains_three_elements(void** state)
roster_destroy();
}
void
first_three_elements_correct(void** state)
void first_three_elements_correct(void **state)
{
roster_create();
roster_add("Bob", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("James", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
PContact bob = list->data;
PContact dave = (g_slist_next(list))->data;
PContact james = (g_slist_next(g_slist_next(list)))->data;
@@ -113,15 +106,14 @@ first_three_elements_correct(void** state)
roster_destroy();
}
void
add_twice_at_beginning_adds_once(void** state)
void add_twice_at_beginning_adds_once(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
PContact first = list->data;
PContact second = (g_slist_next(list))->data;
PContact third = (g_slist_next(g_slist_next(list)))->data;
@@ -135,15 +127,14 @@ add_twice_at_beginning_adds_once(void** state)
roster_destroy();
}
void
add_twice_in_middle_adds_once(void** state)
void add_twice_in_middle_adds_once(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
PContact first = list->data;
PContact second = (g_slist_next(list))->data;
PContact third = (g_slist_next(g_slist_next(list)))->data;
@@ -157,15 +148,14 @@ add_twice_in_middle_adds_once(void** state)
roster_destroy();
}
void
add_twice_at_end_adds_once(void** state)
void add_twice_at_end_adds_once(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
roster_add("James", NULL, NULL, NULL, FALSE);
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
PContact first = list->data;
PContact second = (g_slist_next(list))->data;
PContact third = (g_slist_next(g_slist_next(list)))->data;
@@ -179,91 +169,84 @@ add_twice_at_end_adds_once(void** state)
roster_destroy();
}
void
find_first_exists(void** state)
void find_first_exists(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
char* search = strdup("B");
char *search = strdup("B");
char* result = roster_contact_autocomplete(search, FALSE, NULL);
char *result = roster_contact_autocomplete(search, FALSE, NULL);
assert_string_equal("Bob", result);
free(result);
free(search);
roster_destroy();
}
void
find_second_exists(void** state)
void find_second_exists(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
char* result = roster_contact_autocomplete("Dav", FALSE, NULL);
char *result = roster_contact_autocomplete("Dav", FALSE, NULL);
assert_string_equal("Dave", result);
free(result);
roster_destroy();
}
void
find_third_exists(void** state)
void find_third_exists(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
char* result = roster_contact_autocomplete("Ja", FALSE, NULL);
char *result = roster_contact_autocomplete("Ja", FALSE, NULL);
assert_string_equal("James", result);
free(result);
roster_destroy();
}
void
find_returns_null(void** state)
void find_returns_null(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Dave", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
char* result = roster_contact_autocomplete("Mike", FALSE, NULL);
char *result = roster_contact_autocomplete("Mike", FALSE, NULL);
assert_null(result);
roster_destroy();
}
void
find_on_empty_returns_null(void** state)
void find_on_empty_returns_null(void **state)
{
roster_create();
char* result = roster_contact_autocomplete("James", FALSE, NULL);
char *result = roster_contact_autocomplete("James", FALSE, NULL);
assert_null(result);
roster_destroy();
}
void
find_twice_returns_second_when_two_match(void** state)
void find_twice_returns_second_when_two_match(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Jamie", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
char* result1 = roster_contact_autocomplete("Jam", FALSE, NULL);
char* result2 = roster_contact_autocomplete(result1, FALSE, NULL);
char *result1 = roster_contact_autocomplete("Jam", FALSE, NULL);
char *result2 = roster_contact_autocomplete(result1, FALSE, NULL);
assert_string_equal("Jamie", result2);
free(result1);
free(result2);
roster_destroy();
}
void
find_five_times_finds_fifth(void** state)
void find_five_times_finds_fifth(void **state)
{
roster_create();
roster_add("Jama", NULL, NULL, NULL, FALSE);
@@ -277,11 +260,11 @@ find_five_times_finds_fifth(void** state)
roster_add("Jamy", NULL, NULL, NULL, FALSE);
roster_add("Jamz", NULL, NULL, NULL, FALSE);
char* result1 = roster_contact_autocomplete("Jam", FALSE, NULL);
char* result2 = roster_contact_autocomplete(result1, FALSE, NULL);
char* result3 = roster_contact_autocomplete(result2, FALSE, NULL);
char* result4 = roster_contact_autocomplete(result3, FALSE, NULL);
char* result5 = roster_contact_autocomplete(result4, FALSE, NULL);
char *result1 = roster_contact_autocomplete("Jam", FALSE, NULL);
char *result2 = roster_contact_autocomplete(result1, FALSE, NULL);
char *result3 = roster_contact_autocomplete(result2, FALSE, NULL);
char *result4 = roster_contact_autocomplete(result3, FALSE, NULL);
char *result5 = roster_contact_autocomplete(result4, FALSE, NULL);
assert_string_equal("Jamo", result5);
free(result1);
free(result2);
@@ -291,49 +274,46 @@ find_five_times_finds_fifth(void** state)
roster_destroy();
}
void
find_twice_returns_first_when_two_match_and_reset(void** state)
void find_twice_returns_first_when_two_match_and_reset(void **state)
{
roster_create();
roster_add("James", NULL, NULL, NULL, FALSE);
roster_add("Jamie", NULL, NULL, NULL, FALSE);
roster_add("Bob", NULL, NULL, NULL, FALSE);
char* result1 = roster_contact_autocomplete("Jam", FALSE, NULL);
char *result1 = roster_contact_autocomplete("Jam", FALSE, NULL);
roster_reset_search_attempts();
char* result2 = roster_contact_autocomplete(result1, FALSE, NULL);
char *result2 = roster_contact_autocomplete(result1, FALSE, NULL);
assert_string_equal("James", result2);
free(result1);
free(result2);
roster_destroy();
}
void
add_contact_with_no_group(void** state)
void add_contact_with_no_group(void **state)
{
roster_create();
roster_add("person@server.org", NULL, NULL, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 0);
g_list_free_full(groups_res, free);
roster_destroy();
}
void
add_contact_with_group(void** state)
void add_contact_with_group(void **state)
{
roster_create();
GSList* groups = NULL;
GSList *groups = NULL;
groups = g_slist_append(groups, strdup("friends"));
roster_add("person@server.org", NULL, groups, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 1);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
assert_string_equal(found->data, "friends");
@@ -341,20 +321,19 @@ add_contact_with_group(void** state)
roster_destroy();
}
void
add_contact_with_two_groups(void** state)
void add_contact_with_two_groups(void **state)
{
roster_create();
GSList* groups = NULL;
GSList *groups = NULL;
groups = g_slist_append(groups, strdup("friends"));
groups = g_slist_append(groups, strdup("work"));
roster_add("person@server.org", NULL, groups, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 2);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
assert_string_equal(found->data, "friends");
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
@@ -365,21 +344,20 @@ add_contact_with_two_groups(void** state)
roster_destroy();
}
void
add_contact_with_three_groups(void** state)
void add_contact_with_three_groups(void **state)
{
roster_create();
GSList* groups = NULL;
GSList *groups = NULL;
groups = g_slist_append(groups, strdup("friends"));
groups = g_slist_append(groups, strdup("work"));
groups = g_slist_append(groups, strdup("stuff"));
roster_add("person@server.org", NULL, groups, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 3);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
assert_string_equal(found->data, "friends");
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
@@ -393,18 +371,17 @@ add_contact_with_three_groups(void** state)
roster_destroy();
}
void
add_contact_with_three_groups_update_adding_two(void** state)
void add_contact_with_three_groups_update_adding_two(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("friends"));
groups2 = g_slist_append(groups2, strdup("work"));
groups2 = g_slist_append(groups2, strdup("stuff"));
@@ -412,10 +389,10 @@ add_contact_with_three_groups_update_adding_two(void** state)
groups2 = g_slist_append(groups2, strdup("people"));
roster_update("person@server.org", NULL, groups2, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 5);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
assert_string_equal(found->data, "friends");
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
@@ -435,26 +412,25 @@ add_contact_with_three_groups_update_adding_two(void** state)
roster_destroy();
}
void
add_contact_with_three_groups_update_removing_one(void** state)
void add_contact_with_three_groups_update_removing_one(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("friends"));
groups2 = g_slist_append(groups2, strdup("stuff"));
roster_update("person@server.org", NULL, groups2, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 2);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
assert_string_equal(found->data, "friends");
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
@@ -465,25 +441,24 @@ add_contact_with_three_groups_update_removing_one(void** state)
roster_destroy();
}
void
add_contact_with_three_groups_update_removing_two(void** state)
void add_contact_with_three_groups_update_removing_two(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("stuff"));
roster_update("person@server.org", NULL, groups2, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 1);
GList* found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
assert_string_equal(found->data, "stuff");
@@ -491,12 +466,11 @@ add_contact_with_three_groups_update_removing_two(void** state)
roster_destroy();
}
void
add_contact_with_three_groups_update_removing_three(void** state)
void add_contact_with_three_groups_update_removing_three(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
@@ -504,33 +478,32 @@ add_contact_with_three_groups_update_removing_three(void** state)
roster_update("person@server.org", NULL, NULL, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 0);
g_list_free_full(groups_res, free);
roster_destroy();
}
void
add_contact_with_three_groups_update_two_new(void** state)
void add_contact_with_three_groups_update_two_new(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("newfriends"));
groups2 = g_slist_append(groups2, strdup("somepeople"));
roster_update("person@server.org", NULL, groups2, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 2);
GList* found = g_list_find_custom(groups_res, "newfriends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "newfriends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
found = g_list_find_custom(groups_res, "somepeople", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
@@ -539,12 +512,11 @@ add_contact_with_three_groups_update_two_new(void** state)
roster_destroy();
}
void
add_remove_contact_groups(void** state)
void add_remove_contact_groups(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
@@ -552,33 +524,32 @@ add_remove_contact_groups(void** state)
roster_remove("person@server.org", "person@server.org");
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 0);
g_list_free_full(groups_res, free);
roster_destroy();
}
void
add_contacts_with_different_groups(void** state)
void add_contacts_with_different_groups(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("newfriends"));
groups2 = g_slist_append(groups2, strdup("somepeople"));
roster_add("bob@server.org", NULL, groups2, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 5);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
@@ -593,27 +564,26 @@ add_contacts_with_different_groups(void** state)
roster_destroy();
}
void
add_contacts_with_same_groups(void** state)
void add_contacts_with_same_groups(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("friends"));
groups2 = g_slist_append(groups2, strdup("work"));
groups2 = g_slist_append(groups2, strdup("stuff"));
roster_add("bob@server.org", NULL, groups2, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 3);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
@@ -624,27 +594,26 @@ add_contacts_with_same_groups(void** state)
roster_destroy();
}
void
add_contacts_with_overlapping_groups(void** state)
void add_contacts_with_overlapping_groups(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("friends"));
groups2 = g_slist_append(groups2, strdup("work"));
groups2 = g_slist_append(groups2, strdup("different"));
roster_add("bob@server.org", NULL, groups2, NULL, FALSE);
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 4);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
@@ -657,18 +626,17 @@ add_contacts_with_overlapping_groups(void** state)
roster_destroy();
}
void
remove_contact_with_remaining_in_group(void** state)
void remove_contact_with_remaining_in_group(void **state)
{
roster_create();
GSList* groups1 = NULL;
GSList *groups1 = NULL;
groups1 = g_slist_append(groups1, strdup("friends"));
groups1 = g_slist_append(groups1, strdup("work"));
groups1 = g_slist_append(groups1, strdup("stuff"));
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
GSList* groups2 = NULL;
GSList *groups2 = NULL;
groups2 = g_slist_append(groups2, strdup("friends"));
groups2 = g_slist_append(groups2, strdup("work"));
groups2 = g_slist_append(groups2, strdup("different"));
@@ -676,10 +644,10 @@ remove_contact_with_remaining_in_group(void** state)
roster_remove("bob@server.org", "bob@server.org");
GList* groups_res = roster_get_groups();
GList *groups_res = roster_get_groups();
assert_int_equal(g_list_length(groups_res), 3);
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
GList *found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
assert_true(found != NULL);