Split functional tests

1 files changed, 11 insertions, 89 deletions

diff --git a/functionaltests/test_connect.c b/functionaltests/test_connect.c
index 6f145dd5..fc2d0f94 100644
--- a/functionaltests/test_connect.c
+++ b/functionaltests/test_connect.c
@@ -14,8 +14,7 @@
 void
 connect_jid(void **state)
 {
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
+    prof_connect("stabber@localhost", "password");
 
     assert_true(prof_output("Connecting as stabber@localhost"));
     assert_true(prof_output("stabber@localhost logged in successfully"));
@@ -24,8 +23,7 @@ connect_jid(void **state)
 void
 connect_jid_requests_roster(void **state)
 {
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
+    prof_connect("stabber@localhost", "password");
 
     assert_true(stbbr_received(
         "<iq id=\"*\" type=\"get\"><query xmlns=\"jabber:iq:roster\"/></iq>"
@@ -44,8 +42,7 @@ connect_jid_sends_presence_after_receiving_roster(void **state)
         "</iq>"
     );
 
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
+    prof_connect("stabber@localhost", "password");
 
     assert_true(stbbr_received(
         "<presence id=\"*\">"
@@ -57,8 +54,7 @@ connect_jid_sends_presence_after_receiving_roster(void **state)
 void
 connect_jid_requests_bookmarks(void **state)
 {
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
+    prof_connect("stabber@localhost", "password");
 
     assert_true(stbbr_received(
         "<iq id=\"*\" type=\"get\">"
@@ -72,14 +68,13 @@ connect_jid_requests_bookmarks(void **state)
 void
 connect_bad_password(void **state)
 {
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("badpassword");
+    prof_connect("stabber@localhost", "badpassword");
 
     assert_true(prof_output("Login failed."));
 }
 
 void
-show_presence_updates(void **state)
+connect_shows_presence_updates(void **state)
 {
     stbbr_for("roster",
         "<iq id=\"roster\" type=\"result\" to=\"stabber@localhost/profanity\">"
@@ -105,12 +100,11 @@ show_presence_updates(void **state)
         "</presence>"
     );
 
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
+    prof_connect("stabber@localhost", "password");
 
-    assert_true(prof_output("Buddy1 (mobile) is dnd"));
-    assert_true(prof_output("Buddy1 (laptop) is chat"));
-    assert_true(prof_output("Buddy2 (work) is away"));
+    assert_true(prof_output("Buddy1 (mobile) is dnd, \"busy!\""));
+    assert_true(prof_output("Buddy1 (laptop) is chat, \"Talk to me!\""));
+    assert_true(prof_output("Buddy2 (work) is away, \"Out of office\""));
 
     stbbr_send(
         "<presence to=\"stabber@localhost\" from=\"buddy1@localhost/mobile\">"
@@ -119,77 +113,5 @@ show_presence_updates(void **state)
         "</presence>"
     );
 
-    assert_true(prof_output("Buddy1 (mobile) is xa"));
-}
-
-void
-sends_rooms_iq(void **state)
-{
-    stbbr_for("confreq",
-        "<iq id=\"confreq\" type=\"result\" to=\"stabber@localhost/profanity\" from=\"conference.localhost\">"
-            "<query xmlns=\"http://jabber.org/protocol/disco#items\">"
-                "<item jid=\"chatroom@conference.localhost\" name=\"A chat room\"/>"
-                "<item jid=\"hangout@conference.localhost\" name=\"Another chat room\"/>"
-            "</query>"
-        "</iq>"
-    );
-
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
-    prof_input("/rooms");
-
-    assert_true(stbbr_last_received(
-        "<iq id=\"confreq\" to=\"conference.localhost\" type=\"get\">"
-            "<query xmlns=\"http://jabber.org/protocol/disco#items\"/>"
-        "</iq>"
-    ));
-}
-
-void
-multiple_pings(void **state)
-{
-    stbbr_for("prof_ping_1",
-        "<iq id=\"prof_ping_1\" type=\"result\" to=\"stabber@localhost/profanity\"/>"
-    );
-    stbbr_for("prof_ping_2",
-        "<iq id=\"prof_ping_2\" type=\"result\" to=\"stabber@localhost/profanity\"/>"
-    );
-
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
-
-    prof_input("/ping");
-    assert_true(stbbr_received(
-        "<iq id=\"prof_ping_1\" type=\"get\">"
-            "<ping xmlns=\"urn:xmpp:ping\"/>"
-        "</iq>"
-    ));
-    assert_true(prof_output("Ping response from server"));
-
-    prof_input("/ping");
-    assert_true(stbbr_received(
-        "<iq id=\"prof_ping_2\" type=\"get\">"
-            "<ping xmlns=\"urn:xmpp:ping\"/>"
-        "</iq>"
-    ));
-    assert_true(prof_output("Ping response from server"));
-}
-
-void
-responds_to_ping(void **state)
-{
-    prof_input("/connect stabber@localhost port 5230");
-    prof_input("password");
-
-    assert_true(prof_output("stabber@localhost logged in successfully"));
-
-    stbbr_send(
-        "<iq id=\"pingtest1\" type=\"get\" to=\"stabber@localhost/profanity\" from=\"localhost\">"
-            "<ping xmlns=\"urn:xmpp:ping\"/>"
-        "</iq>"
-    );
-
-    assert_true(stbbr_received(
-        "<iq id=\"pingtest1\" type=\"result\" from=\"stabber@localhost/profanity\" to=\"localhost\"/>"
-    ));
+    assert_true(prof_output("Buddy1 (mobile) is xa, \"Gone :(\""));
 }