diff --git a/tests/unittests/log/stub_log.c b/tests/unittests/log/stub_log.c index aba5a603..75ee991f 100644 --- a/tests/unittests/log/stub_log.c +++ b/tests/unittests/log/stub_log.c @@ -60,10 +60,10 @@ log_msg(log_level_t level, const char* const area, const char* const msg) { } -const char* +const gchar* get_log_file_location(void) { - return mock_ptr_type(char*); + return mock_ptr_type(gchar*); } int diff --git a/tests/unittests/test_callbacks.c b/tests/unittests/test_callbacks.c index 8f735e56..005ce82a 100644 --- a/tests/unittests/test_callbacks.c +++ b/tests/unittests/test_callbacks.c @@ -20,15 +20,15 @@ returns_commands(void** state) { plugins_init(); PluginCommand* command1 = g_new0(PluginCommand, 1); - command1->command_name = strdup("command1"); + command1->command_name = g_strdup("command1"); callbacks_add_command("plugin1", command1); PluginCommand* command2 = g_new0(PluginCommand, 1); - command2->command_name = strdup("command2"); + command2->command_name = g_strdup("command2"); callbacks_add_command("plugin1", command2); PluginCommand* command3 = g_new0(PluginCommand, 1); - command3->command_name = strdup("command3"); + command3->command_name = g_strdup("command3"); callbacks_add_command("plugin2", command3); GList* names = plugins_get_command_names(); diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c index 6dfd4571..dd607408 100644 --- a/tests/unittests/test_cmd_account.c +++ b/tests/unittests/test_cmd_account.c @@ -50,10 +50,10 @@ cmd_account_list_shows_accounts(void** state) { gchar* args[] = { "list", NULL }; - gchar** accounts = g_new0(gchar, 4); - accounts[0] = strdup("account1"); - accounts[1] = strdup("account2"); - accounts[2] = strdup("account3"); + gchar** accounts = g_new0(gchar*, 4); + accounts[0] = g_strdup("account1"); + accounts[1] = g_strdup("account2"); + accounts[2] = g_strdup("account3"); accounts[3] = NULL; will_return(accounts_get_list, accounts); diff --git a/tests/unittests/test_cmd_alias.c b/tests/unittests/test_cmd_alias.c index c86733a2..69081012 100644 --- a/tests/unittests/test_cmd_alias.c +++ b/tests/unittests/test_cmd_alias.c @@ -73,7 +73,7 @@ cmd_alias_add_adds_alias(void** state) gchar* returned_val = prefs_get_alias("hc"); assert_string_equal("/help commands", returned_val); - free(returned_val); + g_free(returned_val); } void @@ -105,7 +105,7 @@ cmd_alias_remove_removes_alias(void** state) gchar* returned_val = prefs_get_alias("hn"); assert_null(returned_val); - free(returned_val); + g_free(returned_val); } void diff --git a/tests/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c index 7f6d54ea..be37ef07 100644 --- a/tests/unittests/test_cmd_connect.c +++ b/tests/unittests/test_cmd_connect.c @@ -52,7 +52,7 @@ cmd_connect_when_no_account(void** state) expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); - will_return(ui_ask_password, strdup("password")); + will_return(ui_ask_password, g_strdup("password")); expect_cons_show("Connecting as user@server.org"); @@ -76,7 +76,7 @@ cmd_connect_fail_message(void** state) expect_any(accounts_get_account, name); will_return(accounts_get_account, NULL); - will_return(ui_ask_password, strdup("password")); + will_return(ui_ask_password, g_strdup("password")); expect_cons_show("Connecting as user@server.org"); @@ -102,7 +102,7 @@ cmd_connect_lowercases_argument_with_no_account(void** state) expect_string(accounts_get_account, name, "USER@server.ORG"); will_return(accounts_get_account, NULL); - will_return(ui_ask_password, strdup("password")); + will_return(ui_ask_password, g_strdup("password")); expect_cons_show("Connecting as user@server.org"); @@ -130,7 +130,7 @@ cmd_connect_lowercases_argument_with_account(void** state) expect_cons_show("Connecting with account Jabber_org as me@jabber.org"); - expect_memory(session_connect_with_account, account, account, sizeof(account)); + expect_memory(session_connect_with_account, account, account, sizeof(ProfAccount)); will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); @@ -149,7 +149,7 @@ cmd_connect_asks_password_when_not_in_account(void** state) expect_any(accounts_get_account, name); will_return(accounts_get_account, account); - will_return(ui_ask_password, strdup("password")); + will_return(ui_ask_password, g_strdup("password")); expect_cons_show("Connecting with account jabber_org as me@jabber.org"); @@ -338,7 +338,7 @@ cmd_connect_with_server_when_provided(void** state) expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); - will_return(ui_ask_password, strdup("password")); + will_return(ui_ask_password, g_strdup("password")); expect_cons_show("Connecting as user@server.org"); @@ -362,7 +362,7 @@ cmd_connect_with_port_when_provided(void** state) expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); - will_return(ui_ask_password, strdup("password")); + will_return(ui_ask_password, g_strdup("password")); expect_cons_show("Connecting as user@server.org"); @@ -386,7 +386,7 @@ cmd_connect_with_server_and_port_when_provided(void** state) expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); - will_return(ui_ask_password, strdup("password")); + will_return(ui_ask_password, g_strdup("password")); expect_cons_show("Connecting as user@server.org"); @@ -435,7 +435,7 @@ cmd_connect_connects_with_account(void** state) expect_cons_show("Connecting with account jabber_org as me@jabber.org"); - expect_memory(session_connect_with_account, account, account, sizeof(account)); + expect_memory(session_connect_with_account, account, account, sizeof(ProfAccount)); will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c index 7c1850df..832f5e2f 100644 --- a/tests/unittests/test_cmd_otr.c +++ b/tests/unittests/test_cmd_otr.c @@ -247,7 +247,7 @@ cmd_otr_myfp_shows_my_fingerprint(void** state) will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, TRUE); - will_return(otr_get_my_fingerprint, strdup(fingerprint)); + will_return(otr_get_my_fingerprint, g_strdup(fingerprint)); expect_win_println(message->str); @@ -344,7 +344,7 @@ cmd_otr_theirfp_shows_fingerprint(void** state) will_return(connection_get_status, JABBER_CONNECTED); expect_string(otr_get_their_fingerprint, recipient, recipient); - will_return(otr_get_their_fingerprint, strdup(fingerprint)); + will_return(otr_get_their_fingerprint, g_strdup(fingerprint)); expect_win_println(message->str); diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c index aadfedc4..74ba7a98 100644 --- a/tests/unittests/test_cmd_roster.c +++ b/tests/unittests/test_cmd_roster.c @@ -193,7 +193,7 @@ cmd_roster_nick_sends_name_change_request(void** state) roster_create(); GSList* groups = NULL; - groups = g_slist_append(groups, strdup("group1")); + groups = g_slist_append(groups, g_strdup("group1")); roster_add(jid, "bob", groups, "both", FALSE); will_return(connection_get_status, JABBER_CONNECTED); @@ -251,7 +251,7 @@ cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void** state) roster_create(); GSList* groups = NULL; - groups = g_slist_append(groups, strdup("group1")); + groups = g_slist_append(groups, g_strdup("group1")); roster_add(jid, "bob", groups, "both", FALSE); will_return(connection_get_status, JABBER_CONNECTED); diff --git a/tests/unittests/test_common.c b/tests/unittests/test_common.c index 8926e57f..aed343c2 100644 --- a/tests/unittests/test_common.c +++ b/tests/unittests/test_common.c @@ -720,8 +720,8 @@ unique_filename_from_url_td(void** state) assert_string_equal(got_filename, exp_filename); - free(got_filename); - free(exp_filename); + g_free(got_filename); + g_free(exp_filename); } } @@ -735,7 +735,7 @@ _lists_equal(GSList* a, GSList* b) GSList* curra = a; GSList* currb = b; - while (curra) { + while (curra && currb) { int aval = GPOINTER_TO_INT(curra->data); int bval = GPOINTER_TO_INT(currb->data); diff --git a/tests/unittests/test_contact.c b/tests/unittests/test_contact.c index 3f6caa12..118ea462 100644 --- a/tests/unittests/test_contact.c +++ b/tests/unittests/test_contact.c @@ -9,7 +9,7 @@ void contact_in_group(void** state) { GSList* groups = NULL; - groups = g_slist_append(groups, strdup("somegroup")); + groups = g_slist_append(groups, g_strdup("somegroup")); PContact contact = p_contact_new("bob@server.com", "bob", groups, "both", "is offline", FALSE); @@ -25,7 +25,7 @@ void contact_not_in_group(void** state) { GSList* groups = NULL; - groups = g_slist_append(groups, strdup("somegroup")); + groups = g_slist_append(groups, g_strdup("somegroup")); PContact contact = p_contact_new("bob@server.com", "bob", groups, "both", "is offline", FALSE); @@ -74,7 +74,7 @@ contact_string_when_name_exists(void** state) assert_string_equal("bob (laptop)", str); p_contact_free(contact); - free(str); + g_free(str); } void @@ -88,7 +88,7 @@ contact_string_when_name_not_exists(void** state) assert_string_equal("bob@server.com (laptop)", str); p_contact_free(contact); - free(str); + g_free(str); } void @@ -102,7 +102,7 @@ contact_string_when_default_resource(void** state) assert_string_equal("bob", str); p_contact_free(contact); - free(str); + g_free(str); } void diff --git a/tests/unittests/test_form.c b/tests/unittests/test_form.c index 3c04dfaa..2f6b70eb 100644 --- a/tests/unittests/test_form.c +++ b/tests/unittests/test_form.c @@ -18,8 +18,8 @@ _new_form(void) form->title = NULL; form->instructions = NULL; form->fields = NULL; - form->var_to_tag = g_hash_table_new_full(g_str_hash, g_str_equal, free, free); - form->tag_to_var = g_hash_table_new_full(g_str_hash, g_str_equal, free, free); + form->var_to_tag = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + form->tag_to_var = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); form->tag_ac = NULL; return form; @@ -58,8 +58,8 @@ get_form_type_field_returns_null_when_not_present(void** state) { DataForm* form = _new_form(); FormField* field = _new_field(); - field->var = strdup("var1"); - field->values = g_slist_append(field->values, strdup("value1")); + field->var = g_strdup("var1"); + field->values = g_slist_append(field->values, g_strdup("value1")); form->fields = g_slist_append(form->fields, field); char* result = form_get_form_type_field(form); @@ -75,18 +75,18 @@ get_form_type_field_returns_value_when_present(void** state) DataForm* form = _new_form(); FormField* field1 = _new_field(); - field1->var = strdup("var1"); - field1->values = g_slist_append(field1->values, strdup("value1")); + field1->var = g_strdup("var1"); + field1->values = g_slist_append(field1->values, g_strdup("value1")); form->fields = g_slist_append(form->fields, field1); FormField* field2 = _new_field(); - field2->var = strdup("FORM_TYPE"); - field2->values = g_slist_append(field2->values, strdup("value2")); + field2->var = g_strdup("FORM_TYPE"); + field2->values = g_slist_append(field2->values, g_strdup("value2")); form->fields = g_slist_append(form->fields, field2); FormField* field3 = _new_field(); - field3->var = strdup("var3"); - field3->values = g_slist_append(field3->values, strdup("value3")); + field3->var = g_strdup("var3"); + field3->values = g_slist_append(field3->values, g_strdup("value3")); form->fields = g_slist_append(form->fields, field3); char* result = form_get_form_type_field(form); @@ -112,19 +112,19 @@ void get_field_type_returns_correct_type(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); - g_hash_table_insert(form->tag_to_var, strdup("tag2"), strdup("var2")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag2"), g_strdup("var2")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_TEXT_SINGLE; - field1->values = g_slist_append(field1->values, strdup("value1")); + field1->values = g_slist_append(field1->values, g_strdup("value1")); form->fields = g_slist_append(form->fields, field1); FormField* field2 = _new_field(); - field2->var = strdup("var2"); + field2->var = g_strdup("var2"); field2->type_t = FIELD_TEXT_MULTI; - field2->values = g_slist_append(field2->values, strdup("value2")); + field2->values = g_slist_append(field2->values, g_strdup("value2")); form->fields = g_slist_append(form->fields, field2); form_field_type_t result = form_get_field_type(form, "tag2"); @@ -138,17 +138,17 @@ void set_value_adds_when_none(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); - g_hash_table_insert(form->tag_to_var, strdup("tag2"), strdup("var2")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag2"), g_strdup("var2")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_TEXT_SINGLE; - field1->values = g_slist_append(field1->values, strdup("value1")); + field1->values = g_slist_append(field1->values, g_strdup("value1")); form->fields = g_slist_append(form->fields, field1); FormField* field2 = _new_field(); - field2->var = strdup("var2"); + field2->var = g_strdup("var2"); field2->type_t = FIELD_LIST_SINGLE; form->fields = g_slist_append(form->fields, field2); @@ -177,18 +177,18 @@ void set_value_updates_when_one(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); - g_hash_table_insert(form->tag_to_var, strdup("tag2"), strdup("var2")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag2"), g_strdup("var2")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_TEXT_SINGLE; form->fields = g_slist_append(form->fields, field1); FormField* field2 = _new_field(); - field2->var = strdup("var2"); + field2->var = g_strdup("var2"); field2->type_t = FIELD_LIST_SINGLE; - field2->values = g_slist_append(field2->values, strdup("value2")); + field2->values = g_slist_append(field2->values, g_strdup("value2")); form->fields = g_slist_append(form->fields, field2); form_set_value(form, "tag2", "a new value"); @@ -216,18 +216,18 @@ void add_unique_value_adds_when_none(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); - g_hash_table_insert(form->tag_to_var, strdup("tag2"), strdup("var2")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag2"), g_strdup("var2")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_JID_MULTI; form->fields = g_slist_append(form->fields, field1); FormField* field2 = _new_field(); - field2->var = strdup("var2"); + field2->var = g_strdup("var2"); field2->type_t = FIELD_LIST_SINGLE; - field2->values = g_slist_append(field2->values, strdup("value2")); + field2->values = g_slist_append(field2->values, g_strdup("value2")); form->fields = g_slist_append(form->fields, field2); gboolean ret = form_add_unique_value(form, "tag1", "me@server.com"); @@ -256,19 +256,19 @@ void add_unique_value_does_nothing_when_exists(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); - g_hash_table_insert(form->tag_to_var, strdup("tag2"), strdup("var2")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag2"), g_strdup("var2")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_JID_MULTI; - field1->values = g_slist_append(field1->values, strdup("me@server.com")); + field1->values = g_slist_append(field1->values, g_strdup("me@server.com")); form->fields = g_slist_append(form->fields, field1); FormField* field2 = _new_field(); - field2->var = strdup("var2"); + field2->var = g_strdup("var2"); field2->type_t = FIELD_LIST_SINGLE; - field2->values = g_slist_append(field2->values, strdup("value2")); + field2->values = g_slist_append(field2->values, g_strdup("value2")); form->fields = g_slist_append(form->fields, field2); gboolean ret = form_add_unique_value(form, "tag1", "me@server.com"); @@ -297,21 +297,21 @@ void add_unique_value_adds_when_doesnt_exist(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); - g_hash_table_insert(form->tag_to_var, strdup("tag2"), strdup("var2")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag2"), g_strdup("var2")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_JID_MULTI; - field1->values = g_slist_append(field1->values, strdup("dolan@server.com")); - field1->values = g_slist_append(field1->values, strdup("kieran@server.com")); - field1->values = g_slist_append(field1->values, strdup("chi@server.com")); + field1->values = g_slist_append(field1->values, g_strdup("dolan@server.com")); + field1->values = g_slist_append(field1->values, g_strdup("kieran@server.com")); + field1->values = g_slist_append(field1->values, g_strdup("chi@server.com")); form->fields = g_slist_append(form->fields, field1); FormField* field2 = _new_field(); - field2->var = strdup("var2"); + field2->var = g_strdup("var2"); field2->type_t = FIELD_LIST_SINGLE; - field2->values = g_slist_append(field2->values, strdup("value2")); + field2->values = g_slist_append(field2->values, g_strdup("value2")); form->fields = g_slist_append(form->fields, field2); gboolean ret = form_add_unique_value(form, "tag1", "me@server.com"); @@ -346,10 +346,10 @@ void add_value_adds_when_none(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; form->fields = g_slist_append(form->fields, field1); @@ -378,14 +378,14 @@ void add_value_adds_when_some(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("some text")); - field1->values = g_slist_append(field1->values, strdup("some more text")); - field1->values = g_slist_append(field1->values, strdup("yet some more text")); + field1->values = g_slist_append(field1->values, g_strdup("some text")); + field1->values = g_slist_append(field1->values, g_strdup("some more text")); + field1->values = g_slist_append(field1->values, g_strdup("yet some more text")); form->fields = g_slist_append(form->fields, field1); form_add_value(form, "tag1", "new value"); @@ -419,15 +419,15 @@ void add_value_adds_when_exists(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("some text")); - field1->values = g_slist_append(field1->values, strdup("some more text")); - field1->values = g_slist_append(field1->values, strdup("yet some more text")); - field1->values = g_slist_append(field1->values, strdup("new value")); + field1->values = g_slist_append(field1->values, g_strdup("some text")); + field1->values = g_slist_append(field1->values, g_strdup("some more text")); + field1->values = g_slist_append(field1->values, g_strdup("yet some more text")); + field1->values = g_slist_append(field1->values, g_strdup("new value")); form->fields = g_slist_append(form->fields, field1); form_add_value(form, "tag1", "new value"); @@ -461,10 +461,10 @@ void remove_value_does_nothing_when_none(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; form->fields = g_slist_append(form->fields, field1); @@ -490,15 +490,15 @@ void remove_value_does_nothing_when_doesnt_exist(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("value1")); - field1->values = g_slist_append(field1->values, strdup("value2")); - field1->values = g_slist_append(field1->values, strdup("value3")); - field1->values = g_slist_append(field1->values, strdup("value4")); + field1->values = g_slist_append(field1->values, g_strdup("value1")); + field1->values = g_slist_append(field1->values, g_strdup("value2")); + field1->values = g_slist_append(field1->values, g_strdup("value3")); + field1->values = g_slist_append(field1->values, g_strdup("value4")); form->fields = g_slist_append(form->fields, field1); gboolean res = form_remove_value(form, "tag1", "value5"); @@ -532,12 +532,12 @@ void remove_value_removes_when_one(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("value4")); + field1->values = g_slist_append(field1->values, g_strdup("value4")); form->fields = g_slist_append(form->fields, field1); gboolean res = form_remove_value(form, "tag1", "value4"); @@ -562,15 +562,15 @@ void remove_value_removes_when_many(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("value1")); - field1->values = g_slist_append(field1->values, strdup("value2")); - field1->values = g_slist_append(field1->values, strdup("value3")); - field1->values = g_slist_append(field1->values, strdup("value4")); + field1->values = g_slist_append(field1->values, g_strdup("value1")); + field1->values = g_slist_append(field1->values, g_strdup("value2")); + field1->values = g_slist_append(field1->values, g_strdup("value3")); + field1->values = g_slist_append(field1->values, g_strdup("value4")); form->fields = g_slist_append(form->fields, field1); gboolean res = form_remove_value(form, "tag1", "value2"); @@ -604,10 +604,10 @@ void remove_text_multi_value_does_nothing_when_none(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; form->fields = g_slist_append(form->fields, field1); @@ -633,15 +633,15 @@ void remove_text_multi_value_does_nothing_when_doesnt_exist(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("value1")); - field1->values = g_slist_append(field1->values, strdup("value2")); - field1->values = g_slist_append(field1->values, strdup("value3")); - field1->values = g_slist_append(field1->values, strdup("value4")); + field1->values = g_slist_append(field1->values, g_strdup("value1")); + field1->values = g_slist_append(field1->values, g_strdup("value2")); + field1->values = g_slist_append(field1->values, g_strdup("value3")); + field1->values = g_slist_append(field1->values, g_strdup("value4")); form->fields = g_slist_append(form->fields, field1); gboolean res = form_remove_text_multi_value(form, "tag1", 5); @@ -675,12 +675,12 @@ void remove_text_multi_value_removes_when_one(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("value4")); + field1->values = g_slist_append(field1->values, g_strdup("value4")); form->fields = g_slist_append(form->fields, field1); gboolean res = form_remove_text_multi_value(form, "tag1", 1); @@ -705,15 +705,15 @@ void remove_text_multi_value_removes_when_many(void** state) { DataForm* form = _new_form(); - g_hash_table_insert(form->tag_to_var, strdup("tag1"), strdup("var1")); + g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); FormField* field1 = _new_field(); - field1->var = strdup("var1"); + field1->var = g_strdup("var1"); field1->type_t = FIELD_LIST_MULTI; - field1->values = g_slist_append(field1->values, strdup("value1")); - field1->values = g_slist_append(field1->values, strdup("value2")); - field1->values = g_slist_append(field1->values, strdup("value3")); - field1->values = g_slist_append(field1->values, strdup("value4")); + field1->values = g_slist_append(field1->values, g_strdup("value1")); + field1->values = g_slist_append(field1->values, g_strdup("value2")); + field1->values = g_slist_append(field1->values, g_strdup("value3")); + field1->values = g_slist_append(field1->values, g_strdup("value4")); form->fields = g_slist_append(form->fields, field1); gboolean res = form_remove_text_multi_value(form, "tag1", 2); diff --git a/tests/unittests/test_parser.c b/tests/unittests/test_parser.c index 2783e8d0..b72527f4 100644 --- a/tests/unittests/test_parser.c +++ b/tests/unittests/test_parser.c @@ -460,7 +460,7 @@ get_first_of_one(void** state) char* result = get_start(inp, 2); assert_string_equal("one", result); - free(result); + g_free(result); } void @@ -470,7 +470,7 @@ get_first_of_two(void** state) char* result = get_start(inp, 2); assert_string_equal("one ", result); - free(result); + g_free(result); } void @@ -480,7 +480,7 @@ get_first_two_of_three(void** state) char* result = get_start(inp, 3); assert_string_equal("one two ", result); - free(result); + g_free(result); } void @@ -490,7 +490,7 @@ get_first_two_of_three_first_quoted(void** state) char* result = get_start(inp, 3); assert_string_equal("\"one\" two ", result); - free(result); + g_free(result); } void @@ -500,7 +500,7 @@ get_first_two_of_three_second_quoted(void** state) char* result = get_start(inp, 3); assert_string_equal("one \"two\" ", result); - free(result); + g_free(result); } void @@ -510,7 +510,7 @@ get_first_two_of_three_first_and_second_quoted(void** state) char* result = get_start(inp, 3); assert_string_equal("\"one\" \"two\" ", result); - free(result); + g_free(result); } void diff --git a/tests/unittests/test_roster_list.c b/tests/unittests/test_roster_list.c index 7fbaf394..cc28063b 100644 --- a/tests/unittests/test_roster_list.c +++ b/tests/unittests/test_roster_list.c @@ -184,12 +184,12 @@ find_first_exists(void** state) roster_add("Dave", NULL, NULL, NULL, FALSE); roster_add("Bob", NULL, NULL, NULL, FALSE); - char* search = strdup("B"); + char* search = g_strdup("B"); char* result = roster_contact_autocomplete(search, FALSE, NULL); assert_string_equal("Bob", result); - free(result); - free(search); + g_free(result); + g_free(search); roster_destroy(); } @@ -203,7 +203,7 @@ find_second_exists(void** state) char* result = roster_contact_autocomplete("Dav", FALSE, NULL); assert_string_equal("Dave", result); - free(result); + g_free(result); roster_destroy(); } @@ -217,7 +217,7 @@ find_third_exists(void** state) char* result = roster_contact_autocomplete("Ja", FALSE, NULL); assert_string_equal("James", result); - free(result); + g_free(result); roster_destroy(); } @@ -254,8 +254,8 @@ find_twice_returns_second_when_two_match(void** state) 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); + g_free(result1); + g_free(result2); roster_destroy(); } @@ -280,11 +280,11 @@ find_five_times_finds_fifth(void** state) 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); - free(result3); - free(result4); - free(result5); + g_free(result1); + g_free(result2); + g_free(result3); + g_free(result4); + g_free(result5); roster_destroy(); } @@ -300,8 +300,8 @@ find_twice_returns_first_when_two_match_and_reset(void** state) roster_reset_search_attempts(); char* result2 = roster_contact_autocomplete(result1, FALSE, NULL); assert_string_equal("James", result2); - free(result1); - free(result2); + g_free(result1); + g_free(result2); roster_destroy(); } @@ -314,7 +314,7 @@ add_contact_with_no_group(void** state) GList* groups_res = roster_get_groups(); assert_int_equal(g_list_length(groups_res), 0); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -324,7 +324,7 @@ add_contact_with_group(void** state) roster_create(); GSList* groups = NULL; - groups = g_slist_append(groups, strdup("friends")); + groups = g_slist_append(groups, g_strdup("friends")); roster_add("person@server.org", NULL, groups, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -334,7 +334,7 @@ add_contact_with_group(void** state) assert_true(found != NULL); assert_string_equal(found->data, "friends"); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -344,8 +344,8 @@ add_contact_with_two_groups(void** state) roster_create(); GSList* groups = NULL; - groups = g_slist_append(groups, strdup("friends")); - groups = g_slist_append(groups, strdup("work")); + groups = g_slist_append(groups, g_strdup("friends")); + groups = g_slist_append(groups, g_strdup("work")); roster_add("person@server.org", NULL, groups, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -358,7 +358,7 @@ add_contact_with_two_groups(void** state) assert_true(found != NULL); assert_string_equal(found->data, "work"); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -368,9 +368,9 @@ add_contact_with_three_groups(void** state) roster_create(); GSList* groups = NULL; - groups = g_slist_append(groups, strdup("friends")); - groups = g_slist_append(groups, strdup("work")); - groups = g_slist_append(groups, strdup("stuff")); + groups = g_slist_append(groups, g_strdup("friends")); + groups = g_slist_append(groups, g_strdup("work")); + groups = g_slist_append(groups, g_strdup("stuff")); roster_add("person@server.org", NULL, groups, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -386,7 +386,7 @@ add_contact_with_three_groups(void** state) assert_true(found != NULL); assert_string_equal(found->data, "stuff"); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -396,17 +396,17 @@ add_contact_with_three_groups_update_adding_two(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("friends")); - groups2 = g_slist_append(groups2, strdup("work")); - groups2 = g_slist_append(groups2, strdup("stuff")); - groups2 = g_slist_append(groups2, strdup("things")); - groups2 = g_slist_append(groups2, strdup("people")); + groups2 = g_slist_append(groups2, g_strdup("friends")); + groups2 = g_slist_append(groups2, g_strdup("work")); + groups2 = g_slist_append(groups2, g_strdup("stuff")); + groups2 = g_slist_append(groups2, g_strdup("things")); + groups2 = g_slist_append(groups2, g_strdup("people")); roster_update("person@server.org", NULL, groups2, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -428,7 +428,7 @@ add_contact_with_three_groups_update_adding_two(void** state) assert_true(found != NULL); assert_string_equal(found->data, "people"); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -438,14 +438,14 @@ add_contact_with_three_groups_update_removing_one(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("friends")); - groups2 = g_slist_append(groups2, strdup("stuff")); + groups2 = g_slist_append(groups2, g_strdup("friends")); + groups2 = g_slist_append(groups2, g_strdup("stuff")); roster_update("person@server.org", NULL, groups2, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -458,7 +458,7 @@ add_contact_with_three_groups_update_removing_one(void** state) assert_true(found != NULL); assert_string_equal(found->data, "stuff"); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -468,13 +468,13 @@ add_contact_with_three_groups_update_removing_two(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("stuff")); + groups2 = g_slist_append(groups2, g_strdup("stuff")); roster_update("person@server.org", NULL, groups2, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -484,7 +484,7 @@ add_contact_with_three_groups_update_removing_two(void** state) assert_true(found != NULL); assert_string_equal(found->data, "stuff"); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -494,9 +494,9 @@ add_contact_with_three_groups_update_removing_three(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); roster_update("person@server.org", NULL, NULL, NULL, FALSE); @@ -504,7 +504,7 @@ add_contact_with_three_groups_update_removing_three(void** state) GList* groups_res = roster_get_groups(); assert_int_equal(g_list_length(groups_res), 0); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -514,14 +514,14 @@ add_contact_with_three_groups_update_two_new(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("newfriends")); - groups2 = g_slist_append(groups2, strdup("somepeople")); + groups2 = g_slist_append(groups2, g_strdup("newfriends")); + groups2 = g_slist_append(groups2, g_strdup("somepeople")); roster_update("person@server.org", NULL, groups2, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -532,7 +532,7 @@ add_contact_with_three_groups_update_two_new(void** state) found = g_list_find_custom(groups_res, "somepeople", (GCompareFunc)g_strcmp0); assert_true(found != NULL); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -542,9 +542,9 @@ add_remove_contact_groups(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); roster_remove("person@server.org", "person@server.org"); @@ -552,7 +552,7 @@ add_remove_contact_groups(void** state) GList* groups_res = roster_get_groups(); assert_int_equal(g_list_length(groups_res), 0); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -562,14 +562,14 @@ add_contacts_with_different_groups(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("newfriends")); - groups2 = g_slist_append(groups2, strdup("somepeople")); + groups2 = g_slist_append(groups2, g_strdup("newfriends")); + groups2 = g_slist_append(groups2, g_strdup("somepeople")); roster_add("bob@server.org", NULL, groups2, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -586,7 +586,7 @@ add_contacts_with_different_groups(void** state) found = g_list_find_custom(groups_res, "somepeople", (GCompareFunc)g_strcmp0); assert_true(found != NULL); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -596,15 +596,15 @@ add_contacts_with_same_groups(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("friends")); - groups2 = g_slist_append(groups2, strdup("work")); - groups2 = g_slist_append(groups2, strdup("stuff")); + groups2 = g_slist_append(groups2, g_strdup("friends")); + groups2 = g_slist_append(groups2, g_strdup("work")); + groups2 = g_slist_append(groups2, g_strdup("stuff")); roster_add("bob@server.org", NULL, groups2, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -617,7 +617,7 @@ add_contacts_with_same_groups(void** state) found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0); assert_true(found != NULL); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -627,15 +627,15 @@ add_contacts_with_overlapping_groups(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("friends")); - groups2 = g_slist_append(groups2, strdup("work")); - groups2 = g_slist_append(groups2, strdup("different")); + groups2 = g_slist_append(groups2, g_strdup("friends")); + groups2 = g_slist_append(groups2, g_strdup("work")); + groups2 = g_slist_append(groups2, g_strdup("different")); roster_add("bob@server.org", NULL, groups2, NULL, FALSE); GList* groups_res = roster_get_groups(); @@ -650,7 +650,7 @@ add_contacts_with_overlapping_groups(void** state) found = g_list_find_custom(groups_res, "different", (GCompareFunc)g_strcmp0); assert_true(found != NULL); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); } @@ -660,15 +660,15 @@ remove_contact_with_remaining_in_group(void** state) roster_create(); GSList* groups1 = NULL; - groups1 = g_slist_append(groups1, strdup("friends")); - groups1 = g_slist_append(groups1, strdup("work")); - groups1 = g_slist_append(groups1, strdup("stuff")); + groups1 = g_slist_append(groups1, g_strdup("friends")); + groups1 = g_slist_append(groups1, g_strdup("work")); + groups1 = g_slist_append(groups1, g_strdup("stuff")); roster_add("person@server.org", NULL, groups1, NULL, FALSE); GSList* groups2 = NULL; - groups2 = g_slist_append(groups2, strdup("friends")); - groups2 = g_slist_append(groups2, strdup("work")); - groups2 = g_slist_append(groups2, strdup("different")); + groups2 = g_slist_append(groups2, g_strdup("friends")); + groups2 = g_slist_append(groups2, g_strdup("work")); + groups2 = g_slist_append(groups2, g_strdup("different")); roster_add("bob@server.org", NULL, groups2, NULL, FALSE); roster_remove("bob@server.org", "bob@server.org"); @@ -683,7 +683,7 @@ remove_contact_with_remaining_in_group(void** state) found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0); assert_true(found != NULL); - g_list_free_full(groups_res, free); + g_list_free_full(groups_res, g_free); roster_destroy(); }