devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into openpgp

Browse Source 
Conflicts:
	src/command/commands.c
	src/command/commands.h
This commit is contained in:
James Booth
2015-06-17 00:40:06 +01:00
parent 637b8bee9f a798dc5618
commit 8fde14879a
25 changed files with 689 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unittests/test_cmd_join.c
View File

@@ -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);