Fix tests, move glob creation

This commit is contained in:
James Booth
2018-01-27 23:51:03 +00:00
parent 2e414797a4
commit e571ccd8ea
10 changed files with 67 additions and 43 deletions

View File

@@ -14,8 +14,8 @@
void
rooms_query(void **state)
{
stbbr_for_id("confreq",
"<iq id='confreq' type='result' to='stabber@localhost/profanity' from='conference.localhost'>"
stbbr_for_id("prof_confreq_4",
"<iq id='prof_confreq_4' type='result' to='stabber@localhost/profanity' from='conference.localhost'>"
"<query xmlns='http://jabber.org/protocol/disco#items'>"
"<item jid='chatroom@conference.localhost' name='A chat room'/>"
"<item jid='hangout@conference.localhost' name='Another chat room'/>"
@@ -25,13 +25,13 @@ rooms_query(void **state)
prof_connect();
prof_input("/rooms conference.localhost");
prof_input("/rooms service conference.localhost");
assert_true(prof_output_exact("chatroom@conference.localhost, (A chat room)"));
assert_true(prof_output_exact("hangout@conference.localhost, (Another chat room)"));
assert_true(prof_output_exact("chatroom@conference.localhost (A chat room)"));
assert_true(prof_output_exact("hangout@conference.localhost (Another chat room)"));
assert_true(stbbr_last_received(
"<iq id='confreq' to='conference.localhost' type='get'>"
"<iq id='prof_confreq_4' to='conference.localhost' type='get'>"
"<query xmlns='http://jabber.org/protocol/disco#items'/>"
"</iq>"
));