diff options
author | James Booth <boothj5@gmail.com> | 2015-06-17 00:40:06 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-17 00:40:06 +0100 |
commit | 8fde14879a7f9d6d6a60244e8f8000c123dd3115 (patch) | |
tree | 34916cad79cb270959b576f3f46231db1b4d2231 /tests/unittests/test_cmd_join.c | |
parent | 637b8bee9fcaeedbb09636b76e34270abbfcab47 (diff) | |
parent | a798dc5618580265e60f93be091b649b4bf86dee (diff) | |
download | profani-tty-8fde14879a7f9d6d6a60244e8f8000c123dd3115.tar.gz |
Merge branch 'master' into openpgp
Conflicts: src/command/commands.c src/command/commands.h
Diffstat (limited to 'tests/unittests/test_cmd_join.c')
-rw-r--r-- | tests/unittests/test_cmd_join.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c index 8dc6cf02..cdb275d9 100644 --- a/tests/unittests/test_cmd_join.c +++ b/tests/unittests/test_cmd_join.c @@ -24,7 +24,7 @@ static void test_with_connection_status(jabber_conn_status_t status) expect_cons_show("You are not currently connected."); - gboolean result = cmd_join(NULL, *help); + gboolean result = cmd_join(NULL, NULL, *help); assert_true(result); free(help); @@ -60,7 +60,7 @@ void cmd_join_shows_error_message_when_invalid_room_jid(void **state) expect_cons_show_error("Specified room has incorrect format."); expect_cons_show(""); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -90,7 +90,7 @@ void cmd_join_uses_account_mucservice_when_no_service_specified(void **state) expect_string(presence_join_room, nick, nick); expect_value(presence_join_room, passwd, NULL); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -118,7 +118,7 @@ void cmd_join_uses_supplied_nick(void **state) expect_string(presence_join_room, nick, nick); expect_value(presence_join_room, passwd, NULL); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -146,7 +146,7 @@ void cmd_join_uses_account_nick_when_not_supplied(void **state) expect_string(presence_join_room, nick, account_nick); expect_value(presence_join_room, passwd, NULL); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -177,7 +177,7 @@ void cmd_join_uses_password_when_supplied(void **state) expect_string(presence_join_room, nick, account_nick); expect_value(presence_join_room, passwd, password); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); |