aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Added test to show usage when no room supplied to /join

Browse Source
This commit is contained in:
James Booth 2014-03-08 00:19:21 +00:00
parent f3fe1d34d2
commit 2d54c565ce
4 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/commands.c
View File

@ -1583,6 +1583,12 @@ cmd_join(gchar **args, struct cmd_help_t help)
return TRUE;
}
if (args[0] == NULL) {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
Jid *room_arg = jid_create(args[0]);
if (room_arg == NULL) {
cons_show_error("Specified room has incorrect format");
@ -1594,8 +1600,10 @@ cmd_join(gchar **args, struct cmd_help_t help)
char *nick = NULL;
char *passwd = NULL;
GString *room_str = g_string_new("");
Jid *my_jid = jid_create(jabber_get_fulljid());
ProfAccount *account = accounts_get_account(jabber_get_account_name());
const char *full_jid = jabber_get_fulljid();
Jid *my_jid = jid_create(full_jid);
char *account_name = jabber_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
// full room jid supplied (room@server)
if (room_arg->localpart != NULL) {

19
tests/test_cmd_join.c
View File

@ -48,6 +48,25 @@ 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)
{
mock_cons_show();
CommandHelp *help = malloc(sizeof(CommandHelp));
help->usage = "some usage";
gchar *args[] = { NULL };
mock_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_connect_shows_usage_when_no_server_value(void **state)
{

1
tests/test_cmd_join.h
View File

@ -2,3 +2,4 @@ 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);

1
tests/testsuite.c
View File

@ -491,6 +491,7 @@ 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),
};
return run_tests(all_tests);