aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into help

Browse Source
This commit is contained in:
James Booth 2015-07-23 00:43:20 +01:00
commit 3985f22250
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/functionaltests/proftest.c
View File

@ -212,7 +212,18 @@ prof_output_regex(char *text)
void void
prof_connect_with_roster(char *roster) prof_connect_with_roster(char *roster)
{ {
stbbr_for_query("jabber:iq:roster", roster); GString *roster_str = g_string_new(
"<iq type=\"result\" to=\"stabber@localhost/profanity\">"
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
);
g_string_append(roster_str, roster);
g_string_append(roster_str,
"</query>"
"</iq>"
);
stbbr_for_query("jabber:iq:roster", roster_str->str);
g_string_free(roster_str, TRUE);
stbbr_for_id("prof_presence_1", stbbr_for_id("prof_presence_1",
"<presence id=\"prof_presence_1\" lang=\"en\" to=\"stabber@localhost/profanity\" from=\"stabber@localhost/profanity\">" "<presence id=\"prof_presence_1\" lang=\"en\" to=\"stabber@localhost/profanity\" from=\"stabber@localhost/profanity\">"
@ -235,11 +246,7 @@ void
prof_connect(void) prof_connect(void)
{ {
prof_connect_with_roster( prof_connect_with_roster(
"<iq type=\"result\" to=\"stabber@localhost/profanity\">" "<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">" "<item jid=\"buddy2@localhost\" subscription=\"both\" name=\"Buddy2\"/>"
"<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
"<item jid=\"buddy2@localhost\" subscription=\"both\" name=\"Buddy2\"/>"
"</query>"
"</iq>"
); );
} }

14
tests/functionaltests/test_roster.c
View File

@ -67,12 +67,8 @@ void
sends_remove_item(void **state) sends_remove_item(void **state)
{ {
prof_connect_with_roster( prof_connect_with_roster(
"<iq type=\"result\" to=\"stabber@localhost/profanity\">" "<item jid=\"buddy1@localhost\" subscription=\"both\"/>"
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">" "<item jid=\"buddy2@localhost\" subscription=\"both\"/>"
"<item jid=\"buddy1@localhost\" subscription=\"both\"/>"
"<item jid=\"buddy2@localhost\" subscription=\"both\"/>"
"</query>"
"</iq>"
); );
stbbr_for_query("jabber:iq:roster", stbbr_for_query("jabber:iq:roster",
@ -100,11 +96,7 @@ void
sends_nick_change(void **state) sends_nick_change(void **state)
{ {
prof_connect_with_roster( prof_connect_with_roster(
"<iq type=\"result\" to=\"stabber@localhost/profanity\">" "<item jid=\"buddy1@localhost\" subscription=\"both\"/>"
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
"<item jid=\"buddy1@localhost\" subscription=\"both\"/>"
"</query>"
"</iq>"
); );
prof_input("/roster nick buddy1@localhost Buddy1"); prof_input("/roster nick buddy1@localhost Buddy1");