Tidied functional tests

This commit is contained in:
James Booth
2015-06-13 19:41:11 +01:00
parent e0783e20db
commit a48b9fcec2
10 changed files with 99 additions and 191 deletions

View File

@@ -11,19 +11,10 @@
#include "proftest.h"
void
connect_jid(void **state)
{
prof_connect("stabber@localhost", "password");
assert_true(prof_output_exact("Connecting as stabber@localhost"));
assert_true(prof_output_regex("stabber@localhost logged in successfully, .+online.+ \\(priority 0\\)\\."));
}
void
connect_jid_requests_roster(void **state)
{
prof_connect("stabber@localhost", "password");
prof_connect();
assert_true(stbbr_received(
"<iq id=\"*\" type=\"get\"><query xmlns=\"jabber:iq:roster\"/></iq>"
@@ -33,16 +24,7 @@ connect_jid_requests_roster(void **state)
void
connect_jid_sends_presence_after_receiving_roster(void **state)
{
stbbr_for_query("jabber:iq: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>"
);
prof_connect("stabber@localhost", "password");
prof_connect();
assert_true(stbbr_received(
"<presence id=\"*\">"
@@ -54,7 +36,7 @@ connect_jid_sends_presence_after_receiving_roster(void **state)
void
connect_jid_requests_bookmarks(void **state)
{
prof_connect("stabber@localhost", "password");
prof_connect();
assert_true(stbbr_received(
"<iq id=\"*\" type=\"get\">"
@@ -68,7 +50,8 @@ connect_jid_requests_bookmarks(void **state)
void
connect_bad_password(void **state)
{
prof_connect("stabber@localhost", "badpassword");
prof_input("/connect stabber@localhost port 5230");
prof_input("badpassword");
assert_true(prof_output_exact("Login failed."));
}
@@ -76,34 +59,30 @@ connect_bad_password(void **state)
void
connect_shows_presence_updates(void **state)
{
stbbr_for_query("jabber:iq: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>"
);
prof_connect();
stbbr_for_id("prof_presence_1",
stbbr_send(
"<presence to=\"stabber@localhost\" from=\"buddy1@localhost/mobile\">"
"<show>dnd</show>"
"<status>busy!</status>"
"</presence>"
);
assert_true(prof_output_exact("Buddy1 (mobile) is dnd, \"busy!\""));
stbbr_send(
"<presence to=\"stabber@localhost\" from=\"buddy1@localhost/laptop\">"
"<show>chat</show>"
"<status>Talk to me!</status>"
"</presence>"
);
assert_true(prof_output_exact("Buddy1 (laptop) is chat, \"Talk to me!\""));
stbbr_send(
"<presence to=\"stabber@localhost\" from=\"buddy2@localhost/work\">"
"<show>away</show>"
"<status>Out of office</status>"
"</presence>"
);
prof_connect("stabber@localhost", "password");
assert_true(prof_output_exact("Buddy1 (mobile) is dnd, \"busy!\""));
assert_true(prof_output_exact("Buddy1 (laptop) is chat, \"Talk to me!\""));
assert_true(prof_output_exact("Buddy2 (work) is away, \"Out of office\""));
stbbr_send(
@@ -112,6 +91,5 @@ connect_shows_presence_updates(void **state)
"<status>Gone :(</status>"
"</presence>"
);
assert_true(prof_output_exact("Buddy1 (mobile) is xa, \"Gone :(\""));
}