about summary refs log tree commit diff stats
path: root/tests/functionaltests/test_ping.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-06-13 19:41:11 +0100
committerJames Booth <boothj5@gmail.com>2015-06-13 19:41:11 +0100
commita48b9fcec2385c5d571f1f02ed6e769d6b4ee821 (patch)
tree93ea8124989e2f799aa5fdf11554f1191fc241fa /tests/functionaltests/test_ping.c
parente0783e20dbf06a07c87c19d4beaaaf8c24a4aeb8 (diff)
downloadprofani-tty-a48b9fcec2385c5d571f1f02ed6e769d6b4ee821.tar.gz
Tidied functional tests
Diffstat (limited to 'tests/functionaltests/test_ping.c')
-rw-r--r--tests/functionaltests/test_ping.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/functionaltests/test_ping.c b/tests/functionaltests/test_ping.c
index e2ca79ca..76fd979c 100644
--- a/tests/functionaltests/test_ping.c
+++ b/tests/functionaltests/test_ping.c
@@ -14,18 +14,18 @@
 void
 ping_multiple(void **state)
 {
-    stbbr_for_id("prof_ping_1",
-        "<iq id=\"prof_ping_1\" type=\"result\" to=\"stabber@localhost/profanity\"/>"
-    );
     stbbr_for_id("prof_ping_2",
         "<iq id=\"prof_ping_2\" type=\"result\" to=\"stabber@localhost/profanity\"/>"
     );
+    stbbr_for_id("prof_ping_3",
+        "<iq id=\"prof_ping_3\" type=\"result\" to=\"stabber@localhost/profanity\"/>"
+    );
 
-    prof_connect("stabber@localhost", "password");
+    prof_connect();
 
     prof_input("/ping");
     assert_true(stbbr_received(
-        "<iq id=\"prof_ping_1\" type=\"get\">"
+        "<iq id=\"prof_ping_2\" type=\"get\">"
             "<ping xmlns=\"urn:xmpp:ping\"/>"
         "</iq>"
     ));
@@ -33,7 +33,7 @@ ping_multiple(void **state)
 
     prof_input("/ping");
     assert_true(stbbr_received(
-        "<iq id=\"prof_ping_2\" type=\"get\">"
+        "<iq id=\"prof_ping_3\" type=\"get\">"
             "<ping xmlns=\"urn:xmpp:ping\"/>"
         "</iq>"
     ));
@@ -43,9 +43,7 @@ ping_multiple(void **state)
 void
 ping_responds(void **state)
 {
-    prof_connect("stabber@localhost", "password");
-
-    assert_true(prof_output_exact("stabber@localhost logged in successfully"));
+    prof_connect();
 
     stbbr_send(
         "<iq id=\"pingtest1\" type=\"get\" to=\"stabber@localhost/profanity\" from=\"localhost\">"