mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-31 15:16:21 +00:00
merge: sync upstream profanity-im/profanity
Sync with upstream profanity-im/profanity.
Major upstream changes incorporated:
Memory management
- Replace malloc+memset with g_new0 throughout codebase
- Adopt auto_gchar / auto_gcharv / auto_gerror / auto_jid cleanup macros
- Replace free() with g_free() for GAlloc'd memory
Editor rewrite
- Remove pthread-based async editor; use GChildWatch callback API
- New launch_editor(initial_content, callback, user_data) interface
- Proper signal handling (SIGINT, SIGTSTP, SIGPIPE reset in child)
- ui_suspend()/ui_resume() integration for TTY management
OMEMO improvements
- Dual backend support: libsignal-protocol-c and libomemo-c
- Proper pre-key removal after use (XEP-0384 compliance)
- Automatic pre-key regeneration when store drops below threshold
- New functions: omemo_is_device_active(), omemo_is_jid_trusted()
- omemo_get_jid_untrusted_fingerprints() for better error messages
- Fingerprint notifications on new device identity discovery
- Deterministic pre-key ID generation tracking max_pre_key_id
- omemo_trust_changed() UI updates on trust state changes
JID validation
- RFC 6122-compliant validation in jid_is_valid()
- Character-level checks (RFC 6122 forbidden chars: & ' / : < > @)
- Length limits: 1023 per component, 3071 total
- New jid_is_valid_user_jid() for user vs. service JID distinction
Database
- Schema migration v3: UNIQUE constraint on archive_id for deduplication
- Triggers for corrected message tracking (replaces_db_id / replaced_by_db_id)
- db_history_result_t return type, _truncate_datetime_suffix()
UI / console
- win_warn_needed() / win_warn_sent() warning deduplication hash table
- PAD_MIN_HEIGHT dynamic pad sizing with PAD_THRESHOLD auto-cleanup
- Spellcheck integration in input field with Unicode word detection
- cons_spellcheck_setting() for /settings ui output
- /[command]? shortcut for command help
Account config
- Account name sanitization for GKeyFile special chars ([ ] = # \n \r)
- Replace popen() with g_spawn_sync() for eval_password
- TLS policy: add "direct" option alongside legacy
Connection
- Port validation with g_assert (0–65535)
- SHA-256 certificate fingerprint support (XMPP_CERT_PUBKEY_FINGERPRINT_SHA256)
- "direct" TLS policy alias for legacy SSL
Common utilities
- str_xml_sanitize() for XML 1.0 illegal character removal
- string_matches_one_of() with formatted error messages
- valid_tls_policy_option() helper
- prof_date_time_format_iso8601() utility
- Improved strip_arg_quotes() with backslash unescaping
- prof_occurrences() uses g_slist_prepend + reverse for performance
PGP / OX
- Proper GPGME resource cleanup with goto-cleanup pattern
- g_string_free(xmppuri) leak fix in _ox_key_lookup
CSV export
- Use GString + g_file_set_contents instead of raw write() syscalls
Tests
- Restructured into subdirectories: command/, config/, xmpp/, ui/, omemo/, otr/, pgp/
- New test_cmd_ac.c for autocompleter unit tests
- Updated stubs for new UI suspend/resume functions
License headers
- Migrate to SPDX-3.0 identifiers (GPL-3.0-or-later WITH OpenSSL-exception)
────────────────────────────────────────────────────
cproof-specific preservations:
- XEP-0308 LMC: replace_id ?: id logic in message/stanza/omemo
- Force encryption: cmd_force_encryption, test_forced_encryption
- CWE-134: format string protection (cons_show("%s", ...))
- y_start_pos-based paging in window.c
- db_history_result_t return type, _truncate_datetime_suffix()
Merge-time fixes:
- common.c: format-security (-Werror) — cons_show(errmsg) → cons_show("%s", errmsg)
- database.c: null-deref guard — !msg->timestamp → msg && !msg->timestamp
- console.c: implicit size_t → int cast — (int)(maxlen + 1)
- tlscerts.c: %d for size_t — %zu
Build system:
- Kept autotools (Makefile.am, configure.ac); upstream uses Meson
- Restored deleted files: bootstrap.sh, autogen.sh, ax_valgrind_check.m4, configure-debug
- Updated Makefile.am test paths for subdirectory structure
- Added test_cmd_ac, test_forced_encryption to test sources
Functional tests:
- Use cproof version; upstream requires stbbr_for_xmlns from updated stabber
- Not yet available in devs/stabber fork
Closes #64
Merge author: jabber.developer2
Commits authors:
Michael Vetter <jubalh@iodoru.org>
& Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
@@ -1,720 +0,0 @@
|
||||
#include <glib.h>
|
||||
#include <string.h>
|
||||
#include "prof_cmocka.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "xmpp/contact.h"
|
||||
#include "xmpp/roster_list.h"
|
||||
|
||||
void
|
||||
empty_list_when_none_added(void** state)
|
||||
{
|
||||
roster_create();
|
||||
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
|
||||
assert_null(list);
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
contains_one_element(void** state)
|
||||
{
|
||||
roster_create();
|
||||
roster_add("James", NULL, NULL, NULL, FALSE);
|
||||
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)
|
||||
{
|
||||
roster_create();
|
||||
roster_add("James", NULL, NULL, NULL, FALSE);
|
||||
GSList* list = roster_get_contacts(ROSTER_ORD_NAME);
|
||||
PContact james = list->data;
|
||||
|
||||
assert_string_equal("James", p_contact_barejid(james));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
assert_int_equal(2, g_slist_length(list));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
PContact first = list->data;
|
||||
PContact second = (g_slist_next(list))->data;
|
||||
|
||||
assert_string_equal("Dave", p_contact_barejid(first));
|
||||
assert_string_equal("James", p_contact_barejid(second));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
assert_int_equal(3, g_slist_length(list));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
PContact bob = list->data;
|
||||
PContact dave = (g_slist_next(list))->data;
|
||||
PContact james = (g_slist_next(g_slist_next(list)))->data;
|
||||
|
||||
assert_string_equal("James", p_contact_barejid(james));
|
||||
assert_string_equal("Dave", p_contact_barejid(dave));
|
||||
assert_string_equal("Bob", p_contact_barejid(bob));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
PContact first = list->data;
|
||||
PContact second = (g_slist_next(list))->data;
|
||||
PContact third = (g_slist_next(g_slist_next(list)))->data;
|
||||
|
||||
assert_int_equal(3, g_slist_length(list));
|
||||
assert_string_equal("Bob", p_contact_barejid(first));
|
||||
assert_string_equal("Dave", p_contact_barejid(second));
|
||||
assert_string_equal("James", p_contact_barejid(third));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
PContact first = list->data;
|
||||
PContact second = (g_slist_next(list))->data;
|
||||
PContact third = (g_slist_next(g_slist_next(list)))->data;
|
||||
|
||||
assert_int_equal(3, g_slist_length(list));
|
||||
assert_string_equal("Bob", p_contact_barejid(first));
|
||||
assert_string_equal("Dave", p_contact_barejid(second));
|
||||
assert_string_equal("James", p_contact_barejid(third));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
PContact first = list->data;
|
||||
PContact second = (g_slist_next(list))->data;
|
||||
PContact third = (g_slist_next(g_slist_next(list)))->data;
|
||||
|
||||
assert_int_equal(3, g_slist_length(list));
|
||||
assert_string_equal("Bob", p_contact_barejid(first));
|
||||
assert_string_equal("Dave", p_contact_barejid(second));
|
||||
assert_string_equal("James", p_contact_barejid(third));
|
||||
|
||||
g_slist_free(list);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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* result = roster_contact_autocomplete(search, FALSE, NULL);
|
||||
assert_string_equal("Bob", result);
|
||||
free(result);
|
||||
free(search);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
assert_string_equal("Dave", result);
|
||||
free(result);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
assert_string_equal("James", result);
|
||||
free(result);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
assert_null(result);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
find_on_empty_returns_null(void** state)
|
||||
{
|
||||
roster_create();
|
||||
char* result = roster_contact_autocomplete("James", FALSE, NULL);
|
||||
assert_null(result);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
assert_string_equal("Jamie", result2);
|
||||
free(result1);
|
||||
free(result2);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
find_five_times_finds_fifth(void** state)
|
||||
{
|
||||
roster_create();
|
||||
roster_add("Jama", NULL, NULL, NULL, FALSE);
|
||||
roster_add("Jamb", NULL, NULL, NULL, FALSE);
|
||||
roster_add("Mike", NULL, NULL, NULL, FALSE);
|
||||
roster_add("Dave", NULL, NULL, NULL, FALSE);
|
||||
roster_add("Jamm", NULL, NULL, NULL, FALSE);
|
||||
roster_add("Jamn", NULL, NULL, NULL, FALSE);
|
||||
roster_add("Matt", NULL, NULL, NULL, FALSE);
|
||||
roster_add("Jamo", NULL, NULL, NULL, FALSE);
|
||||
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);
|
||||
assert_string_equal("Jamo", result5);
|
||||
free(result1);
|
||||
free(result2);
|
||||
free(result3);
|
||||
free(result4);
|
||||
free(result5);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
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);
|
||||
roster_reset_search_attempts();
|
||||
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)
|
||||
{
|
||||
roster_create();
|
||||
roster_add("person@server.org", NULL, NULL, NULL, FALSE);
|
||||
|
||||
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)
|
||||
{
|
||||
roster_create();
|
||||
|
||||
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();
|
||||
assert_int_equal(g_list_length(groups_res), 1);
|
||||
|
||||
GList* found = g_list_find_custom(groups_res, "friends", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "friends");
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
roster_add("person@server.org", NULL, groups, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "friends");
|
||||
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "work");
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
roster_add("person@server.org", NULL, groups, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "friends");
|
||||
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "work");
|
||||
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "stuff");
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
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"));
|
||||
roster_update("person@server.org", NULL, groups2, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "friends");
|
||||
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "work");
|
||||
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "stuff");
|
||||
found = g_list_find_custom(groups_res, "things", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "things");
|
||||
found = g_list_find_custom(groups_res, "people", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "people");
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
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"));
|
||||
roster_update("person@server.org", NULL, groups2, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "friends");
|
||||
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "stuff");
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
|
||||
|
||||
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();
|
||||
assert_int_equal(g_list_length(groups_res), 1);
|
||||
|
||||
GList* found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
assert_string_equal(found->data, "stuff");
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
|
||||
|
||||
roster_update("person@server.org", NULL, NULL, NULL, FALSE);
|
||||
|
||||
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)
|
||||
{
|
||||
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"));
|
||||
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"));
|
||||
roster_update("person@server.org", NULL, groups2, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "somepeople", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
roster_add("person@server.org", NULL, groups1, NULL, FALSE);
|
||||
|
||||
roster_remove("person@server.org", "person@server.org");
|
||||
|
||||
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)
|
||||
{
|
||||
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"));
|
||||
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"));
|
||||
roster_add("bob@server.org", NULL, groups2, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
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);
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
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"));
|
||||
roster_add("bob@server.org", NULL, groups2, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
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"));
|
||||
roster_add("bob@server.org", NULL, groups2, NULL, FALSE);
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "different", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
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"));
|
||||
roster_add("bob@server.org", NULL, groups2, NULL, FALSE);
|
||||
|
||||
roster_remove("bob@server.org", "bob@server.org");
|
||||
|
||||
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);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "work", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
found = g_list_find_custom(groups_res, "stuff", (GCompareFunc)g_strcmp0);
|
||||
assert_true(found != NULL);
|
||||
|
||||
g_list_free_full(groups_res, free);
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
get_contact_display_name(void** state)
|
||||
{
|
||||
roster_create();
|
||||
roster_add("person@server.org", "nickname", NULL, NULL, FALSE);
|
||||
|
||||
assert_string_equal("nickname", roster_get_display_name("person@server.org"));
|
||||
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
get_contact_display_name_is_barejid_if_name_is_empty(void** state)
|
||||
{
|
||||
roster_create();
|
||||
roster_add("person@server.org", NULL, NULL, NULL, FALSE);
|
||||
|
||||
assert_string_equal("person@server.org", roster_get_display_name("person@server.org"));
|
||||
|
||||
roster_destroy();
|
||||
}
|
||||
|
||||
void
|
||||
get_contact_display_name_is_passed_barejid_if_contact_does_not_exist(void** state)
|
||||
{
|
||||
roster_create();
|
||||
|
||||
assert_string_equal("person@server.org", roster_get_display_name("person@server.org"));
|
||||
|
||||
roster_destroy();
|
||||
}
|
||||
Reference in New Issue
Block a user