Send active chat state, handle composing and gone from recipients

This commit is contained in:
James Booth
2015-01-10 22:03:40 +00:00
parent 965e82b350
commit 76bd2ec13f
9 changed files with 42 additions and 133 deletions

View File

@@ -18,7 +18,7 @@ void creates_chat_session_on_recipient_activity(void **state)
char *barejid = "myjid@server.org";
char *resource = "tablet";
chat_session_on_recipient_activity(barejid, resource);
chat_session_on_recipient_activity(barejid, resource, FALSE);
ChatSession *session = chat_session_get(barejid);
assert_non_null(session);
@@ -31,8 +31,8 @@ void replaces_chat_session_on_recipient_activity_with_different_resource(void **
char *resource1 = "tablet";
char *resource2 = "mobile";
chat_session_on_recipient_activity(barejid, resource1);
chat_session_on_recipient_activity(barejid, resource2);
chat_session_on_recipient_activity(barejid, resource1, FALSE);
chat_session_on_recipient_activity(barejid, resource2, FALSE);
ChatSession *session = chat_session_get(barejid);
assert_string_equal(session->resource, resource2);
@@ -43,7 +43,7 @@ void removes_chat_session(void **state)
char *barejid = "myjid@server.org";
char *resource1 = "laptop";
chat_session_on_recipient_activity(barejid, resource1);
chat_session_on_recipient_activity(barejid, resource1, FALSE);
chat_session_remove(barejid);
ChatSession *session = chat_session_get(barejid);

View File

@@ -18,8 +18,8 @@ void clears_chat_sessions(void **state)
chat_sessions_init();
roster_init();
chat_session_on_recipient_activity("bob@server.org", "laptop");
chat_session_on_recipient_activity("mike@server.org", "work");
chat_session_on_recipient_activity("bob@server.org", "laptop", FALSE);
chat_session_on_recipient_activity("mike@server.org", "work", FALSE);
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(jabber_get_fulljid, "myjid@myserver.com");

View File

@@ -133,7 +133,7 @@ void handle_message_error_when_recipient_cancel_disables_chat_session(void **sta
prefs_set_boolean(PREF_STATES, TRUE);
chat_sessions_init();
chat_session_on_recipient_activity(barejid, resource);
chat_session_on_recipient_activity(barejid, resource, FALSE);
handle_message_error(barejid, type, err_msg);
ChatSession *session = chat_session_get(barejid);
@@ -186,7 +186,7 @@ void handle_offline_removes_chat_session(void **state)
roster_add(barejid, "bob", NULL, "both", FALSE);
Resource *resourcep = resource_new(resource, RESOURCE_ONLINE, NULL, 10);
roster_update_presence(barejid, resourcep, NULL);
chat_session_on_recipient_activity(barejid, resource);
chat_session_on_recipient_activity(barejid, resource, FALSE);
handle_contact_offline(barejid, resource, NULL);
ChatSession *session = chat_session_get(barejid);
@@ -199,8 +199,8 @@ void handle_offline_removes_chat_session(void **state)
void lost_connection_clears_chat_sessions(void **state)
{
chat_sessions_init();
chat_session_on_recipient_activity("bob@server.org", "laptop");
chat_session_on_recipient_activity("steve@server.org", "mobile");
chat_session_on_recipient_activity("bob@server.org", "laptop", FALSE);
chat_session_on_recipient_activity("steve@server.org", "mobile", FALSE);
expect_any_cons_show_error();
handle_lost_connection();