diff --git a/tests/functionaltests/test_carbons.c b/tests/functionaltests/test_carbons.c
index f7f7297d..aa827212 100644
--- a/tests/functionaltests/test_carbons.c
+++ b/tests/functionaltests/test_carbons.c
@@ -24,7 +24,6 @@ connect_with_carbons_enabled(void** state)
prof_input("/carbons on");
prof_connect();
-
assert_true(stbbr_received(
""));
}
@@ -35,9 +34,10 @@ send_disable_carbons(void** state)
prof_input("/carbons on");
prof_connect();
+ assert_true(stbbr_received(
+ ""));
prof_input("/carbons off");
-
assert_true(stbbr_received(
""));
}
@@ -46,6 +46,7 @@ void
receive_carbon(void** state)
{
prof_input("/carbons on");
+ stbbr_for_xmlns("urn:xmpp:carbons:2", "");
prof_connect();
assert_true(stbbr_received(
@@ -64,20 +65,21 @@ receive_carbon(void** state)
""
""
""
- ""
+ ""
"test carbon from recipient"
""
""
""
"");
- assert_true(prof_output_regex("Buddy1/mobile: .+test carbon from recipient"));
+ assert_true(prof_output_regex("Buddy1/mobile: test carbon from recipient"));
}
void
receive_self_carbon(void** state)
{
prof_input("/carbons on");
+ stbbr_for_xmlns("urn:xmpp:carbons:2", "");
prof_connect();
assert_true(stbbr_received(
@@ -96,20 +98,21 @@ receive_self_carbon(void** state)
""
""
""
- ""
- "self sent carbon"
+ ""
+ "test carbon from sender"
""
""
""
"");
- assert_true(prof_output_regex("me: .+self sent carbon"));
+ assert_true(prof_output_regex("me: test carbon from sender"));
}
void
receive_private_carbon(void** state)
{
prof_input("/carbons on");
+ stbbr_for_xmlns("urn:xmpp:carbons:2", "");
prof_connect();
assert_true(stbbr_received(
@@ -125,10 +128,16 @@ receive_private_carbon(void** state)
assert_true(prof_output_exact("unencrypted"));
stbbr_send(
- ""
+ ""
+ ""
+ ""
+ ""
"Private carbon"
""
+ ""
+ ""
+ ""
"");
- assert_true(prof_output_regex("Buddy1/mobile: .+Private carbon"));
+ assert_true(prof_output_regex("Buddy1/mobile: Private carbon"));
}