diff options
Diffstat (limited to 'tests/functionaltests/test_carbons.c')
| -rw-r--r-- | tests/functionaltests/test_carbons.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/functionaltests/test_carbons.c b/tests/functionaltests/test_carbons.c index 96639d60..94bd57a0 100644 --- a/tests/functionaltests/test_carbons.c +++ b/tests/functionaltests/test_carbons.c @@ -19,7 +19,7 @@ send_enable_carbons(void **state) prof_input("/carbons on"); assert_true(stbbr_received( - "<iq id=\"*\" type=\"set\"><enable xmlns=\"urn:xmpp:carbons:2\"/></iq>" + "<iq id='*' type='set'><enable xmlns='urn:xmpp:carbons:2'/></iq>" )); } @@ -31,7 +31,7 @@ connect_with_carbons_enabled(void **state) prof_connect(); assert_true(stbbr_received( - "<iq id=\"*\" type=\"set\"><enable xmlns=\"urn:xmpp:carbons:2\"/></iq>" + "<iq id='*' type='set'><enable xmlns='urn:xmpp:carbons:2'/></iq>" )); } @@ -45,7 +45,7 @@ send_disable_carbons(void **state) prof_input("/carbons off"); assert_true(stbbr_received( - "<iq id=\"*\" type=\"set\"><disable xmlns=\"urn:xmpp:carbons:2\"/></iq>" + "<iq id='*' type='set'><disable xmlns='urn:xmpp:carbons:2'/></iq>" )); } @@ -56,24 +56,24 @@ receive_carbon(void **state) prof_connect(); assert_true(stbbr_received( - "<iq id=\"*\" type=\"set\"><enable xmlns=\"urn:xmpp:carbons:2\"/></iq>" + "<iq id='*' type='set'><enable xmlns='urn:xmpp:carbons:2'/></iq>" )); stbbr_send( - "<presence to=\"stabber@localhost\" from=\"buddy1@localhost/mobile\">" + "<presence to='stabber@localhost' from='buddy1@localhost/mobile'>" "<priority>10</priority>" "<status>On my mobile</status>" "</presence>" ); assert_true(prof_output_exact("Buddy1 (mobile) is online, \"On my mobile\"")); prof_input("/msg Buddy1"); - prof_output_exact("unencrypted"); + assert_true(prof_output_exact("unencrypted")); stbbr_send( - "<message type=\"chat\" to=\"stabber@localhost/profanity\" from=\"buddy1@localhost\">" - "<received xmlns=\"urn:xmpp:carbons:2\">" - "<forwarded xmlns=\"urn:xmpp:forward:0\">" - "<message id=\"prof_msg_7\" xmlns=\"jabber:client\" type=\"chat\" lang=\"en\" to=\"stabber@localhost/profanity\" from=\"buddy1@localhost/mobile\">" + "<message type='chat' to='stabber@localhost/profanity' from='buddy1@localhost'>" + "<received xmlns='urn:xmpp:carbons:2'>" + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<message id='prof_msg_7' xmlns='jabber:client' type='chat' lang='en' to='stabber@localhost/profanity' from='buddy1@localhost/mobile'>" "<body>test carbon from recipient</body>" "</message>" "</forwarded>" @@ -91,24 +91,24 @@ receive_self_carbon(void **state) prof_connect(); assert_true(stbbr_received( - "<iq id=\"*\" type=\"set\"><enable xmlns=\"urn:xmpp:carbons:2\"/></iq>" + "<iq id='*' type='set'><enable xmlns='urn:xmpp:carbons:2'/></iq>" )); stbbr_send( - "<presence to=\"stabber@localhost\" from=\"buddy1@localhost/mobile\">" + "<presence to='stabber@localhost' from='buddy1@localhost/mobile'>" "<priority>10</priority>" "<status>On my mobile</status>" "</presence>" ); assert_true(prof_output_exact("Buddy1 (mobile) is online, \"On my mobile\"")); prof_input("/msg Buddy1"); - prof_output_exact("unencrypted"); + assert_true(prof_output_exact("unencrypted")); stbbr_send( - "<message type=\"chat\" to=\"stabber@localhost/profanity\" from=\"stabber@localhost\">" - "<sent xmlns=\"urn:xmpp:carbons:2\">" - "<forwarded xmlns=\"urn:xmpp:forward:0\">" - "<message id=\"59\" xmlns=\"jabber:client\" type=\"chat\" to=\"buddy1@localhost/mobile\" lang=\"en\" from=\"stabber@localhost/profanity\">" + "<message type='chat' to='stabber@localhost/profanity' from='stabber@localhost'>" + "<sent xmlns='urn:xmpp:carbons:2'>" + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<message id='59' xmlns='jabber:client' type='chat' to='buddy1@localhost/mobile' lang='en' from='stabber@localhost/profanity'>" "<body>self sent carbon</body>" "</message>" "</forwarded>" |