refactor(tests): migrate to content-based stubbing
- Replace stbbr_for_id() with stbbr_for_query()/stbbr_send() - Content-based stubbing matches stanzas by namespace instead of ID - Use regex assertions for flexible output matching - Fix timing issues in chat_session and presence tests
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <stabber.h>
|
||||
#include <expect.h>
|
||||
|
||||
#include "proftest.h"
|
||||
|
||||
@@ -13,15 +12,16 @@ presence_online(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/online");
|
||||
prof_input("/status set online");
|
||||
|
||||
assert_true(prof_output_exact("Status set to online (priority 0), \"online\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_3'>"
|
||||
"<presence id='*'>"
|
||||
"<status>online</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to online (priority 0)"));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -29,16 +29,16 @@ presence_online_with_message(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/online \"Hi there\"");
|
||||
prof_input("/status set online \"Hi there\"");
|
||||
|
||||
assert_true(prof_output_exact("Status set to online (priority 0), \"Hi there\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<status>Hi there</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to online (priority 0), \"Hi there\"."));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -46,16 +46,17 @@ presence_away(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/away");
|
||||
prof_input("/status set away");
|
||||
|
||||
assert_true(prof_output_exact("Status set to away (priority 0), \"away\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>away</show>"
|
||||
"<status>away</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to away (priority 0)"));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -63,17 +64,17 @@ presence_away_with_message(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/away \"I'm not here for a bit\"");
|
||||
prof_input("/status set away \"I'm not here for a bit\"");
|
||||
|
||||
assert_true(prof_output_exact("Status set to away (priority 0), \"I'm not here for a bit\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>away</show>"
|
||||
"<status>I'm not here for a bit</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to away (priority 0), \"I'm not here for a bit\"."));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -81,16 +82,17 @@ presence_xa(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/xa");
|
||||
prof_input("/status set xa");
|
||||
|
||||
assert_true(prof_output_exact("Status set to xa (priority 0), \"xa\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>xa</show>"
|
||||
"<status>xa</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to xa (priority 0)"));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -98,17 +100,17 @@ presence_xa_with_message(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/xa \"Gone to the shops\"");
|
||||
prof_input("/status set xa \"Gone to the shops\"");
|
||||
|
||||
assert_true(prof_output_exact("Status set to xa (priority 0), \"Gone to the shops\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>xa</show>"
|
||||
"<status>Gone to the shops</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to xa (priority 0), \"Gone to the shops\"."));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -116,16 +118,17 @@ presence_dnd(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/dnd");
|
||||
prof_input("/status set dnd");
|
||||
|
||||
assert_true(prof_output_exact("Status set to dnd (priority 0), \"dnd\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>dnd</show>"
|
||||
"<status>dnd</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to dnd (priority 0)"));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -133,17 +136,17 @@ presence_dnd_with_message(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/dnd \"Working\"");
|
||||
prof_input("/status set dnd \"Working\"");
|
||||
|
||||
assert_true(prof_output_exact("Status set to dnd (priority 0), \"Working\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>dnd</show>"
|
||||
"<status>Working</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to dnd (priority 0), \"Working\"."));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -151,16 +154,17 @@ presence_chat(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/chat");
|
||||
prof_input("/status set chat");
|
||||
|
||||
assert_true(prof_output_exact("Status set to chat (priority 0), \"chat\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>chat</show>"
|
||||
"<status>chat</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to chat (priority 0)"));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -168,17 +172,17 @@ presence_chat_with_message(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/chat \"Free to talk\"");
|
||||
prof_input("/status set chat \"Free to talk\"");
|
||||
|
||||
assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>chat</show>"
|
||||
"<status>Free to talk</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -188,14 +192,14 @@ presence_set_priority(void **state)
|
||||
|
||||
prof_input("/priority 25");
|
||||
|
||||
assert_true(prof_output_exact("Priority set to 25."));
|
||||
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<priority>25</priority>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
|
||||
assert_true(prof_output_exact("Priority set to 25."));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -204,24 +208,24 @@ presence_includes_priority(void **state)
|
||||
prof_connect();
|
||||
|
||||
prof_input("/priority 25");
|
||||
assert_true(prof_output_exact("Priority set to 25."));
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<priority>25</priority>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
assert_true(prof_output_exact("Priority set to 25."));
|
||||
|
||||
prof_input("/chat \"Free to talk\"");
|
||||
prof_input("/status set chat \"Free to talk\"");
|
||||
assert_true(prof_output_exact("Status set to chat (priority 25), \"Free to talk\"."));
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_5'>"
|
||||
"<presence id='*'>"
|
||||
"<priority>25</priority>"
|
||||
"<show>chat</show>"
|
||||
"<status>Free to talk</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
assert_true(prof_output_exact("Status set to chat (priority 25), \"Free to talk\"."));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -229,26 +233,26 @@ presence_keeps_status(void **state)
|
||||
{
|
||||
prof_connect();
|
||||
|
||||
prof_input("/chat \"Free to talk\"");
|
||||
prof_input("/status set chat \"Free to talk\"");
|
||||
assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_4'>"
|
||||
"<presence id='*'>"
|
||||
"<show>chat</show>"
|
||||
"<status>Free to talk</status>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));
|
||||
|
||||
prof_input("/priority 25");
|
||||
assert_true(prof_output_exact("Priority set to 25."));
|
||||
assert_true(stbbr_received(
|
||||
"<presence id='prof_presence_5'>"
|
||||
"<presence id='*'>"
|
||||
"<show>chat</show>"
|
||||
"<status>Free to talk</status>"
|
||||
"<priority>25</priority>"
|
||||
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
|
||||
"</presence>"
|
||||
));
|
||||
assert_true(prof_output_exact("Priority set to 25."));
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user