mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into osx-functional
This commit is contained in:
commit
b583290907
@ -103,6 +103,7 @@ functionaltest_sources = \
|
|||||||
tests/functionaltests/test_chat_session.c tests/functionaltests/test_chat_session.h \
|
tests/functionaltests/test_chat_session.c tests/functionaltests/test_chat_session.h \
|
||||||
tests/functionaltests/test_carbons.c tests/functionaltests/test_carbons.h \
|
tests/functionaltests/test_carbons.c tests/functionaltests/test_carbons.h \
|
||||||
tests/functionaltests/test_receipts.c tests/functionaltests/test_receipts.h \
|
tests/functionaltests/test_receipts.c tests/functionaltests/test_receipts.h \
|
||||||
|
tests/functionaltests/test_roster.c tests/functionaltests/test_roster.h \
|
||||||
tests/functionaltests/functionaltests.c
|
tests/functionaltests/functionaltests.c
|
||||||
|
|
||||||
main_source = src/main.c
|
main_source = src/main.c
|
||||||
|
@ -102,7 +102,9 @@ roster_send_add_new(const char * const barejid, const char * const name)
|
|||||||
{
|
{
|
||||||
xmpp_conn_t * const conn = connection_get_conn();
|
xmpp_conn_t * const conn = connection_get_conn();
|
||||||
xmpp_ctx_t * const ctx = connection_get_ctx();
|
xmpp_ctx_t * const ctx = connection_get_ctx();
|
||||||
xmpp_stanza_t *iq = stanza_create_roster_set(ctx, NULL, barejid, name, NULL);
|
char *id = create_unique_id("roster");
|
||||||
|
xmpp_stanza_t *iq = stanza_create_roster_set(ctx, id, barejid, name, NULL);
|
||||||
|
free(id);
|
||||||
xmpp_send(conn, iq);
|
xmpp_send(conn, iq);
|
||||||
xmpp_stanza_release(iq);
|
xmpp_stanza_release(iq);
|
||||||
}
|
}
|
||||||
@ -122,8 +124,9 @@ roster_send_name_change(const char * const barejid, const char * const new_name,
|
|||||||
{
|
{
|
||||||
xmpp_conn_t * const conn = connection_get_conn();
|
xmpp_conn_t * const conn = connection_get_conn();
|
||||||
xmpp_ctx_t * const ctx = connection_get_ctx();
|
xmpp_ctx_t * const ctx = connection_get_ctx();
|
||||||
xmpp_stanza_t *iq = stanza_create_roster_set(ctx, NULL, barejid, new_name,
|
char *id = create_unique_id("roster");
|
||||||
groups);
|
xmpp_stanza_t *iq = stanza_create_roster_set(ctx, id, barejid, new_name, groups);
|
||||||
|
free(id);
|
||||||
xmpp_send(conn, iq);
|
xmpp_send(conn, iq);
|
||||||
xmpp_stanza_release(iq);
|
xmpp_stanza_release(iq);
|
||||||
}
|
}
|
||||||
@ -354,4 +357,4 @@ _get_groups_from_item(xmpp_stanza_t *item)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return groups;
|
return groups;
|
||||||
}
|
}
|
||||||
|
@ -373,6 +373,10 @@ stanza_create_roster_remove_set(xmpp_ctx_t *ctx, const char * const barejid)
|
|||||||
xmpp_stanza_set_name(iq, STANZA_NAME_IQ);
|
xmpp_stanza_set_name(iq, STANZA_NAME_IQ);
|
||||||
xmpp_stanza_set_type(iq, STANZA_TYPE_SET);
|
xmpp_stanza_set_type(iq, STANZA_TYPE_SET);
|
||||||
|
|
||||||
|
char *id = create_unique_id("roster");
|
||||||
|
xmpp_stanza_set_id(iq, id);
|
||||||
|
free(id);
|
||||||
|
|
||||||
xmpp_stanza_t *query = xmpp_stanza_new(ctx);
|
xmpp_stanza_t *query = xmpp_stanza_new(ctx);
|
||||||
xmpp_stanza_set_name(query, STANZA_NAME_QUERY);
|
xmpp_stanza_set_name(query, STANZA_NAME_QUERY);
|
||||||
xmpp_stanza_set_ns(query, XMPP_NS_ROSTER);
|
xmpp_stanza_set_ns(query, XMPP_NS_ROSTER);
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#include "test_carbons.h"
|
#include "test_carbons.h"
|
||||||
#include "test_chat_session.h"
|
#include "test_chat_session.h"
|
||||||
#include "test_receipts.h"
|
#include "test_receipts.h"
|
||||||
|
#include "test_roster.h"
|
||||||
|
|
||||||
#define PROF_FUNC_TEST(test) unit_test_setup_teardown(test, init_prof_test, close_prof_test)
|
#define PROF_FUNC_TEST(test) unit_test_setup_teardown(test, init_prof_test, close_prof_test)
|
||||||
|
|
||||||
@ -74,6 +75,11 @@ int main(int argc, char* argv[]) {
|
|||||||
|
|
||||||
PROF_FUNC_TEST(send_receipt_request),
|
PROF_FUNC_TEST(send_receipt_request),
|
||||||
PROF_FUNC_TEST(send_receipt_on_request),
|
PROF_FUNC_TEST(send_receipt_on_request),
|
||||||
|
|
||||||
|
PROF_FUNC_TEST(sends_new_item),
|
||||||
|
PROF_FUNC_TEST(sends_new_item_nick),
|
||||||
|
PROF_FUNC_TEST(sends_remove_item),
|
||||||
|
PROF_FUNC_TEST(sends_nick_change),
|
||||||
};
|
};
|
||||||
|
|
||||||
return run_tests(all_tests);
|
return run_tests(all_tests);
|
||||||
|
@ -245,16 +245,10 @@ prof_output_glob(char *text)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
prof_connect(void)
|
prof_connect_with_roster(char *roster)
|
||||||
{
|
{
|
||||||
stbbr_for_query("jabber:iq:roster",
|
stbbr_for_query("jabber:iq:roster", roster);
|
||||||
"<iq type=\"result\" to=\"stabber@localhost/profanity\">"
|
|
||||||
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
|
|
||||||
"<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
|
|
||||||
"<item jid=\"buddy2@localhost\" subscription=\"both\" name=\"Buddy2\"/>"
|
|
||||||
"</query>"
|
|
||||||
"</iq>"
|
|
||||||
);
|
|
||||||
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\">"
|
||||||
"<priority>0</priority>"
|
"<priority>0</priority>"
|
||||||
@ -271,3 +265,16 @@ prof_connect(void)
|
|||||||
exp_timeout = 10;
|
exp_timeout = 10;
|
||||||
stbbr_wait_for("prof_presence_*");
|
stbbr_wait_for("prof_presence_*");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
prof_connect(void)
|
||||||
|
{
|
||||||
|
prof_connect_with_roster(
|
||||||
|
"<iq type=\"result\" to=\"stabber@localhost/profanity\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
|
||||||
|
"<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
|
||||||
|
"<item jid=\"buddy2@localhost\" subscription=\"both\" name=\"Buddy2\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
@ -9,6 +9,7 @@ void close_prof_test(void **state);
|
|||||||
|
|
||||||
void prof_start(void);
|
void prof_start(void);
|
||||||
void prof_connect(void);
|
void prof_connect(void);
|
||||||
|
void prof_connect_with_roster(char *roster);
|
||||||
void prof_input(char *input);
|
void prof_input(char *input);
|
||||||
|
|
||||||
int prof_output_exact(char *text);
|
int prof_output_exact(char *text);
|
||||||
|
121
tests/functionaltests/test_roster.c
Normal file
121
tests/functionaltests/test_roster.c
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
#include <glib.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <setjmp.h>
|
||||||
|
#include <cmocka.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <stabber.h>
|
||||||
|
#include <expect.h>
|
||||||
|
|
||||||
|
#include "proftest.h"
|
||||||
|
|
||||||
|
void
|
||||||
|
sends_new_item(void **state)
|
||||||
|
{
|
||||||
|
prof_connect();
|
||||||
|
|
||||||
|
stbbr_for_query("jabber:iq:roster",
|
||||||
|
"<iq type=\"set\" from=\"stabber@localhost\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\">"
|
||||||
|
"<item jid=\"bob@localhost\" subscription=\"none\" name=\"\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
);
|
||||||
|
|
||||||
|
prof_input("/roster add bob@localhost");
|
||||||
|
|
||||||
|
assert_true(stbbr_received(
|
||||||
|
"<iq type=\"set\" id=\"*\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\">"
|
||||||
|
"<item jid=\"bob@localhost\" name=\"\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
));
|
||||||
|
|
||||||
|
assert_true(prof_output_exact("Roster item added: bob@localhost"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sends_new_item_nick(void **state)
|
||||||
|
{
|
||||||
|
prof_connect();
|
||||||
|
|
||||||
|
stbbr_for_query("jabber:iq:roster",
|
||||||
|
"<iq type=\"set\" from=\"stabber@localhost\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\">"
|
||||||
|
"<item jid=\"bob@localhost\" subscription=\"none\" name=\"Bobby\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
);
|
||||||
|
|
||||||
|
prof_input("/roster add bob@localhost Bobby");
|
||||||
|
|
||||||
|
assert_true(stbbr_received(
|
||||||
|
"<iq type=\"set\" id=\"*\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\">"
|
||||||
|
"<item jid=\"bob@localhost\" name=\"Bobby\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
));
|
||||||
|
|
||||||
|
assert_true(prof_output_exact("Roster item added: bob@localhost (Bobby)"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sends_remove_item(void **state)
|
||||||
|
{
|
||||||
|
prof_connect_with_roster(
|
||||||
|
"<iq type=\"result\" to=\"stabber@localhost/profanity\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
|
||||||
|
"<item jid=\"buddy1@localhost\" subscription=\"both\"/>"
|
||||||
|
"<item jid=\"buddy2@localhost\" subscription=\"both\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
);
|
||||||
|
|
||||||
|
stbbr_for_query("jabber:iq:roster",
|
||||||
|
"<iq id=\"*\" type=\"set\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\">"
|
||||||
|
"<item jid=\"buddy1@localhost\" subscription=\"remove\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
);
|
||||||
|
|
||||||
|
prof_input("/roster remove buddy1@localhost");
|
||||||
|
|
||||||
|
assert_true(stbbr_received(
|
||||||
|
"<iq type=\"set\" id=\"*\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\">"
|
||||||
|
"<item jid=\"buddy1@localhost\" subscription=\"remove\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
));
|
||||||
|
|
||||||
|
assert_true(prof_output_exact("Roster item removed: buddy1@localhost"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sends_nick_change(void **state)
|
||||||
|
{
|
||||||
|
prof_connect_with_roster(
|
||||||
|
"<iq type=\"result\" to=\"stabber@localhost/profanity\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
|
||||||
|
"<item jid=\"buddy1@localhost\" subscription=\"both\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
);
|
||||||
|
|
||||||
|
prof_input("/roster nick buddy1@localhost Buddy1");
|
||||||
|
|
||||||
|
assert_true(prof_output_exact("Nickname for buddy1@localhost set to: Buddy1."));
|
||||||
|
|
||||||
|
assert_true(stbbr_received(
|
||||||
|
"<iq type=\"set\" id=\"*\">"
|
||||||
|
"<query xmlns=\"jabber:iq:roster\">"
|
||||||
|
"<item jid=\"buddy1@localhost\" name=\"Buddy1\"/>"
|
||||||
|
"</query>"
|
||||||
|
"</iq>"
|
||||||
|
));
|
||||||
|
}
|
4
tests/functionaltests/test_roster.h
Normal file
4
tests/functionaltests/test_roster.h
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
void sends_new_item(void **state);
|
||||||
|
void sends_new_item_nick(void **state);
|
||||||
|
void sends_remove_item(void **state);
|
||||||
|
void sends_nick_change(void **state);
|
Loading…
Reference in New Issue
Block a user