fix(tests): update assertions in functional tests to use regex for improved flexibility

This commit is contained in:
2025-12-22 10:47:23 +03:00
parent c33884ddc4
commit 96acaa322d

View File

@@ -90,7 +90,7 @@ shows_role_and_affiliation_on_join(void **state)
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
} }
void void
@@ -109,7 +109,7 @@ shows_subject_on_join(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost'>"
@@ -137,7 +137,7 @@ shows_history_message(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -171,7 +171,7 @@ shows_occupant_join(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
stbbr_send( stbbr_send(
"<presence to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>" "<presence to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -201,7 +201,7 @@ shows_message(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -228,7 +228,7 @@ shows_me_message_from_occupant(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -236,7 +236,7 @@ shows_me_message_from_occupant(void **state)
"</message>" "</message>"
); );
assert_true(prof_output_exact("*testoccupant did something")); assert_true(prof_output_regex("\\*testoccupant did something"));
} }
void void
@@ -255,7 +255,7 @@ shows_me_message_from_self(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
@@ -263,7 +263,7 @@ shows_me_message_from_self(void **state)
"</message>" "</message>"
); );
assert_true(prof_output_exact("*stabber did something")); assert_true(prof_output_regex("\\*stabber did something"));
} }
void void
@@ -282,10 +282,10 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
prof_input("/win 1"); prof_input("/win 1");
assert_true(prof_output_exact("CProof. Type /help for help information.")); assert_true(prof_output_regex("CProof\\. Type /help for help information\\."));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -293,7 +293,7 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)
"</message>" "</message>"
); );
assert_true(prof_output_exact("<< room message: testoccupant in testroom@conference.localhost (win 2)")); assert_true(prof_output_regex("<< room message: testoccupant in testroom@conference\\.localhost \\(win 2\\)"));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/anotheroccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/anotheroccupant'>"
@@ -301,7 +301,7 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)
"</message>" "</message>"
); );
assert_true(prof_output_exact("<< room message: anotheroccupant in testroom@conference.localhost (win 2)")); assert_true(prof_output_regex("<< room message: anotheroccupant in testroom@conference\\.localhost \\(win 2\\)"));
} }
void void
@@ -310,7 +310,7 @@ shows_first_message_in_console_when_window_not_focussed(void **state)
prof_connect(); prof_connect();
prof_input("/console muc first"); prof_input("/console muc first");
assert_true(prof_output_exact("Console MUC messages set: first")); assert_true(prof_output_regex("Console MUC messages set: first"));
stbbr_for_presence_to("testroom@conference.localhost/stabber", stbbr_for_presence_to("testroom@conference.localhost/stabber",
"<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>" "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
@@ -323,10 +323,10 @@ shows_first_message_in_console_when_window_not_focussed(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
prof_input("/win 1"); prof_input("/win 1");
assert_true(prof_output_exact("CProof. Type /help for help information.")); assert_true(prof_output_regex("CProof\\. Type /help for help information\\."));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -335,10 +335,10 @@ shows_first_message_in_console_when_window_not_focussed(void **state)
); );
sleep(1); sleep(1);
assert_true(prof_output_regex("room message.*testroom@conference.localhost")); assert_true(prof_output_regex("room message.*testroom@conference\\.localhost"));
prof_input("/clear"); prof_input("/clear");
prof_input("/about"); prof_input("/about");
assert_true(prof_output_exact("Type '/help' to show complete help.")); assert_true(prof_output_regex("Type '/help' to show complete help\\."));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/anotheroccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/anotheroccupant'>"
@@ -347,7 +347,7 @@ shows_first_message_in_console_when_window_not_focussed(void **state)
); );
prof_timeout(2); prof_timeout(2);
assert_false(prof_output_exact("<< room message: testroom@conference.localhost (win 2)")); assert_false(prof_output_regex("<< room message: testroom@conference\\.localhost \\(win 2\\)"));
prof_timeout_reset(); prof_timeout_reset();
} }
@@ -357,7 +357,7 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
prof_connect(); prof_connect();
prof_input("/console muc none"); prof_input("/console muc none");
assert_true(prof_output_exact("Console MUC messages set: none")); assert_true(prof_output_regex("Console MUC messages set: none"));
stbbr_for_presence_to("testroom@conference.localhost/stabber", stbbr_for_presence_to("testroom@conference.localhost/stabber",
"<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>" "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
@@ -370,10 +370,10 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
); );
prof_input("/join testroom@conference.localhost"); prof_input("/join testroom@conference.localhost");
assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none")); assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
prof_input("/win 1"); prof_input("/win 1");
assert_true(prof_output_exact("CProof. Type /help for help information.")); assert_true(prof_output_regex("CProof\\. Type /help for help information\\."));
stbbr_send( stbbr_send(
"<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>" "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -382,6 +382,6 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
); );
prof_timeout(2); prof_timeout(2);
assert_false(prof_output_exact("testroom@conference.localhost (win 2)")); assert_false(prof_output_regex("testroom@conference\\.localhost \\(win 2\\)"));
prof_timeout_reset(); prof_timeout_reset();
} }