about summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-04-11 23:38:44 +0100
committerJames Booth <boothj5@gmail.com>2015-04-11 23:38:44 +0100
commit7e4b756e44892fe726153652ecdb76d6158e3f30 (patch)
treeff56dd022dbdfd2942fccc91d5a8fadadb8ba7d5 /tests
parent3597a892336097d6c1346fdad52420758609d2b0 (diff)
parenta2ccd896465982bd6059ae7770532417b1062bdb (diff)
downloadprofani-tty-7e4b756e44892fe726153652ecdb76d6158e3f30.tar.gz
Merge branch 'master' into pgp
Diffstat (limited to 'tests')
-rw-r--r--tests/test_cmd_join.c17
-rw-r--r--tests/test_cmd_join.h1
-rw-r--r--tests/testsuite.c1
3 files changed, 0 insertions, 19 deletions
diff --git a/tests/test_cmd_join.c b/tests/test_cmd_join.c
index 1fd2fcc5..8dc6cf02 100644
--- a/tests/test_cmd_join.c
+++ b/tests/test_cmd_join.c
@@ -50,23 +50,6 @@ void cmd_join_shows_message_when_undefined(void **state)
     test_with_connection_status(JABBER_UNDEFINED);
 }
 
-void cmd_join_shows_usage_when_no_args(void **state)
-{
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
-    gchar *args[] = { NULL };
-
-    will_return(jabber_get_connection_status, JABBER_CONNECTED);
-
-    expect_cons_show("Usage: some usage");
-    expect_cons_show("");
-
-    gboolean result = cmd_join(args, *help);
-    assert_true(result);
-
-    free(help);
-}
-
 void cmd_join_shows_error_message_when_invalid_room_jid(void **state)
 {
     CommandHelp *help = malloc(sizeof(CommandHelp));
diff --git a/tests/test_cmd_join.h b/tests/test_cmd_join.h
index 812aee87..a96fa435 100644
--- a/tests/test_cmd_join.h
+++ b/tests/test_cmd_join.h
@@ -2,7 +2,6 @@ void cmd_join_shows_message_when_disconnecting(void **state);
 void cmd_join_shows_message_when_connecting(void **state);
 void cmd_join_shows_message_when_disconnected(void **state);
 void cmd_join_shows_message_when_undefined(void **state);
-void cmd_join_shows_usage_when_no_args(void **state);
 void cmd_join_shows_error_message_when_invalid_room_jid(void **state);
 void cmd_join_uses_account_mucservice_when_no_service_specified(void **state);
 void cmd_join_uses_supplied_nick(void **state);
diff --git a/tests/testsuite.c b/tests/testsuite.c
index 78d7b570..15682d1f 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -563,7 +563,6 @@ int main(int argc, char* argv[]) {
         unit_test(cmd_join_shows_message_when_connecting),
         unit_test(cmd_join_shows_message_when_disconnected),
         unit_test(cmd_join_shows_message_when_undefined),
-        unit_test(cmd_join_shows_usage_when_no_args),
         unit_test(cmd_join_shows_error_message_when_invalid_room_jid),
         unit_test(cmd_join_uses_account_mucservice_when_no_service_specified),
         unit_test(cmd_join_uses_supplied_nick),