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

Moved pgp signature generation to cl_ev_presence_send

Browse Source
This commit is contained in:
James Booth
2015-05-08 00:07:21 +01:00
parent 0db7bcbdcd
commit acd2d2309f
7 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/pgp/stub_gpg.c
View File

@@ -24,3 +24,9 @@ const char* p_gpg_libver(void)
void p_gpg_free_key(ProfPGPKey *key) {}
void p_gpg_verify(const char * const barejid, const char *const sign) {}
char* p_gpg_sign(const char * const str, const char * const fp)
{
return NULL;
}

10
tests/test_cmd_account.c
View File

@@ -926,6 +926,8 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
{
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "set", "a_account", "online", "10", NULL };
ProfAccount *account = account_new("a_account", "a_jid", NULL, NULL, TRUE, NULL, 5222, "a_resource",
NULL, NULL, 10, 10, 10, 10, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
expect_any(accounts_account_exists, account_name);
will_return(accounts_account_exists, TRUE);
@@ -934,16 +936,22 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
expect_any(accounts_set_priority_online, value);
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(jabber_get_account_name, "a_account");
expect_any(accounts_get_last_presence, account_name);
will_return(accounts_get_last_presence, RESOURCE_ONLINE);
will_return(jabber_get_account_name, "a_account");
will_return(jabber_get_account_name, "a_account");
expect_any(accounts_get_account, name);
will_return(accounts_get_account, account);
will_return(jabber_get_presence_message, "Free to chat");
expect_value(presence_send, status, RESOURCE_ONLINE);
expect_string(presence_send, msg, "Free to chat");
expect_value(presence_send, idle, 0);
expect_value(presence_send, signed_status, NULL);
expect_cons_show("Updated online priority for account a_account: 10");
expect_cons_show("");

3
tests/xmpp/stub_xmpp.c
View File

@@ -114,11 +114,12 @@ void presence_join_room(char *room, char *nick, char * passwd)
void presence_change_room_nick(const char * const room, const char * const nick) {}
void presence_leave_chat_room(const char * const room_jid) {}
void presence_send(resource_presence_t status, const char * const msg, int idle)
void presence_send(resource_presence_t status, const char * const msg, int idle, char *signed_status)
{
check_expected(status);
check_expected(msg);
check_expected(idle);
check_expected(signed_status);
}
gboolean presence_sub_request_exists(const char * const bare_jid)