aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Move /statuses options to /presence command

Browse Source
This commit is contained in:
James Booth 2016-05-31 23:21:19 +01:00
parent 52c01a8ee8
commit 383e601f25
11 changed files with 196 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -111,7 +111,7 @@ unittest_sources = \
tests/unittests/test_preferences.c tests/unittests/test_preferences.h \
tests/unittests/test_server_events.c tests/unittests/test_server_events.h \
tests/unittests/test_muc.c tests/unittests/test_muc.h \
tests/unittests/test_cmd_statuses.c tests/unittests/test_cmd_statuses.h \
tests/unittests/test_cmd_presence.c tests/unittests/test_cmd_presence.h \
tests/unittests/test_cmd_alias.c tests/unittests/test_cmd_alias.h \
tests/unittests/test_cmd_connect.c tests/unittests/test_cmd_connect.h \
tests/unittests/test_cmd_rooms.c tests/unittests/test_cmd_rooms.h \

72
src/command/cmd_ac.c
View File

@ -70,7 +70,6 @@ static char* _bookmark_autocomplete(ProfWin *window, const char *const input);
static char* _otr_autocomplete(ProfWin *window, const char *const input);
static char* _pgp_autocomplete(ProfWin *window, const char *const input);
static char* _connect_autocomplete(ProfWin *window, const char *const input);
static char* _statuses_autocomplete(ProfWin *window, const char *const input);
static char* _alias_autocomplete(ProfWin *window, const char *const input);
static char* _join_autocomplete(ProfWin *window, const char *const input);
static char* _log_autocomplete(ProfWin *window, const char *const input);
@ -157,8 +156,6 @@ static Autocomplete otr_log_ac;
static Autocomplete otr_policy_ac;
static Autocomplete connect_property_ac;
static Autocomplete tls_property_ac;
static Autocomplete statuses_ac;
static Autocomplete statuses_setting_ac;
static Autocomplete alias_ac;
static Autocomplete aliases_ac;
static Autocomplete join_property_ac;
@ -192,6 +189,7 @@ static Autocomplete sendfile_ac;
static Autocomplete blocked_ac;
static Autocomplete tray_ac;
static Autocomplete presence_ac;
static Autocomplete presence_setting_ac;
void
cmd_ac_init(void)
@ -566,16 +564,6 @@ cmd_ac_init(void)
autocomplete_add(join_property_ac, "nick");
autocomplete_add(join_property_ac, "password");
statuses_ac = autocomplete_new();
autocomplete_add(statuses_ac, "console");
autocomplete_add(statuses_ac, "chat");
autocomplete_add(statuses_ac, "muc");
statuses_setting_ac = autocomplete_new();
autocomplete_add(statuses_setting_ac, "all");
autocomplete_add(statuses_setting_ac, "online");
autocomplete_add(statuses_setting_ac, "none");
alias_ac = autocomplete_new();
autocomplete_add(alias_ac, "add");
autocomplete_add(alias_ac, "remove");
@ -729,6 +717,14 @@ cmd_ac_init(void)
presence_ac = autocomplete_new();
autocomplete_add(presence_ac, "titlebar");
autocomplete_add(presence_ac, "console");
autocomplete_add(presence_ac, "chat");
autocomplete_add(presence_ac, "room");
presence_setting_ac = autocomplete_new();
autocomplete_add(presence_setting_ac, "all");
autocomplete_add(presence_setting_ac, "online");
autocomplete_add(presence_setting_ac, "none");
}
void
@ -946,8 +942,6 @@ cmd_ac_reset(ProfWin *window)
autocomplete_reset(otr_policy_ac);
autocomplete_reset(connect_property_ac);
autocomplete_reset(tls_property_ac);
autocomplete_reset(statuses_ac);
autocomplete_reset(statuses_setting_ac);
autocomplete_reset(alias_ac);
autocomplete_reset(aliases_ac);
autocomplete_reset(join_property_ac);
@ -977,6 +971,7 @@ cmd_ac_reset(ProfWin *window)
autocomplete_reset(blocked_ac);
autocomplete_reset(tray_ac);
autocomplete_reset(presence_ac);
autocomplete_reset(presence_setting_ac);
autocomplete_reset(script_ac);
if (script_show_ac) {
@ -1063,8 +1058,6 @@ cmd_ac_uninit(void)
autocomplete_free(otr_policy_ac);
autocomplete_free(connect_property_ac);
autocomplete_free(tls_property_ac);
autocomplete_free(statuses_ac);
autocomplete_free(statuses_setting_ac);
autocomplete_free(alias_ac);
autocomplete_free(aliases_ac);
autocomplete_free(join_property_ac);
@ -1098,6 +1091,7 @@ cmd_ac_uninit(void)
autocomplete_free(blocked_ac);
autocomplete_free(tray_ac);
autocomplete_free(presence_ac);
autocomplete_free(presence_setting_ac);
}
static char*
@ -1204,7 +1198,6 @@ _cmd_ac_complete_params(ProfWin *window, const char *const input)
g_hash_table_insert(ac_funcs, "/otr", _otr_autocomplete);
g_hash_table_insert(ac_funcs, "/pgp", _pgp_autocomplete);
g_hash_table_insert(ac_funcs, "/connect", _connect_autocomplete);
g_hash_table_insert(ac_funcs, "/statuses", _statuses_autocomplete);
g_hash_table_insert(ac_funcs, "/alias", _alias_autocomplete);
g_hash_table_insert(ac_funcs, "/join", _join_autocomplete);
g_hash_table_insert(ac_funcs, "/form", _form_autocomplete);
@ -2362,34 +2355,6 @@ _role_autocomplete(ProfWin *window, const char *const input)
return result;
}
static char*
_statuses_autocomplete(ProfWin *window, const char *const input)
{
char *result = NULL;
result = autocomplete_param_with_ac(input, "/statuses console", statuses_setting_ac, TRUE);
if (result) {
return result;
}
result = autocomplete_param_with_ac(input, "/statuses chat", statuses_setting_ac, TRUE);
if (result) {
return result;
}
result = autocomplete_param_with_ac(input, "/statuses muc", statuses_setting_ac, TRUE);
if (result) {
return result;
}
result = autocomplete_param_with_ac(input, "/statuses", statuses_ac, TRUE);
if (result) {
return result;
}
return NULL;
}
static char*
_wins_autocomplete(ProfWin *window, const char *const input)
{
@ -2941,6 +2906,21 @@ _presence_autocomplete(ProfWin *window, const char *const input)
return found;
}
found = autocomplete_param_with_ac(input, "/presence console", presence_setting_ac, TRUE);
if (found) {
return found;
}
found = autocomplete_param_with_ac(input, "/presence chat", presence_setting_ac, TRUE);
if (found) {
return found;
}
found = autocomplete_param_with_ac(input, "/presence room", presence_setting_ac, TRUE);
if (found) {
return found;
}
found = autocomplete_param_with_ac(input, "/presence", presence_ac, TRUE);
if (found) {
return found;

73
src/command/cmd_defs.c
View File

@ -1200,44 +1200,61 @@ static struct cmd_t command_defs[] =
parse_args, 2, 2, &cons_presence_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_presence)
CMD_TAGS(
CMD_TAG_UI,
CMD_TAG_CHAT)
CMD_SYN(
"/presence titlebar on|off")
CMD_DESC(
"Show the contacts presence in the titlebar.")
CMD_ARGS(
{ "titlebar on|off", "Switch display of the contacts presence in the titlebar on or off." })
CMD_NOEXAMPLES
},
{ "/statuses",
parse_args, 2, 2, &cons_statuses_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_statuses)
CMD_TAGS(
CMD_TAG_UI,
CMD_TAG_CHAT,
CMD_TAG_GROUPCHAT)
CMD_SYN(
"/statuses console|chat|muc all|online|none")
"/presence titlebar on|off",
"/presence console all|online|none",
"/presence chat all|online|none",
"/presence room all|online|none")
CMD_DESC(
"Configure which presence changes are displayed in various windows. "
"The default is 'all' for all windows.")
"Show the contacts presence in the titlebar and configure presence messages in different window types.")
CMD_ARGS(
{ "console", "Configure what is displayed in the console window." },
{ "chat", "Configure what is displayed in chat windows." },
{ "muc", "Configure what is displayed in chat room windows." },
{ "all", "Show all presence changes." },
{ "online", "Show only online/offline changes." },
{ "none", "Don't show any presence changes." })
{ "titlebar on|off", "Switch display of the contacts presence in the titlebar on or off." },
{ "console all", "Show all presence changes in the console window." },
{ "console online", "Show only online/offline presence changes in the console window." },
{ "console none", "Don't show any presence changes in the console window." },
{ "chat all", "Show all presence changes in the chat windows." },
{ "chat online", "Show only online/offline presence changes in chat windows." },
{ "chat none", "Don't show any presence changes in chat windows." },
{ "room all", "Show all presence changes in chat room windows." },
{ "room online", "Show only online/offline presence changes in chat room windows." },
{ "room none", "Don't show any presence changes in chat room windows." })
CMD_EXAMPLES(
"/statuses console none",
"/statuses chat online",
"/statuses muc all")
"/presence titlebar off",
"/presence console none",
"/presence chat online",
"/presence room all")
},
// { "/statuses",
// parse_args, 2, 2, &cons_statuses_setting,
// CMD_NOSUBFUNCS
// CMD_MAINFUNC(cmd_statuses)
// CMD_TAGS(
// CMD_TAG_UI,
// CMD_TAG_CHAT,
// CMD_TAG_GROUPCHAT)
// CMD_SYN(
// "/statuses console|chat|muc all|online|none")
// CMD_DESC(
// "Configure which presence changes are displayed in various windows. "
// "The default is 'all' for all windows.")
// CMD_ARGS(
// { "console", "Configure what is displayed in the console window." },
// { "chat", "Configure what is displayed in chat windows." },
// { "muc", "Configure what is displayed in chat room windows." },
// { "all", "Show all presence changes." },
// { "online", "Show only online/offline changes." },
// { "none", "Don't show any presence changes." })
// CMD_EXAMPLES(
// "/statuses console none",
// "/statuses chat online",
// "/statuses muc all")
// },
{ "/wrap",
parse_args, 1, 1, &cons_wrap_setting,
CMD_NOSUBFUNCS

104
src/command/cmd_funcs.c
View File

@ -4792,12 +4792,59 @@ cmd_console(ProfWin *window, const char *const command, gchar **args)
gboolean
cmd_presence(ProfWin *window, const char *const command, gchar **args)
{
if (g_strcmp0(args[0], "titlebar") != 0) {
if (strcmp(args[0], "console") != 0 &&
strcmp(args[0], "chat") != 0 &&
strcmp(args[0], "room") != 0 &&
strcmp(args[0], "titlebar") != 0) {
cons_bad_cmd_usage(command);
return TRUE;
}
_cmd_set_boolean_preference(args[1], command, "Contact presence", PREF_PRESENCE);
if (strcmp(args[0], "titlebar") == 0) {
_cmd_set_boolean_preference(args[1], command, "Contact presence", PREF_PRESENCE);
return TRUE;
}
if (strcmp(args[1], "all") != 0 &&
strcmp(args[1], "online") != 0 &&
strcmp(args[1], "none") != 0) {
cons_bad_cmd_usage(command);
return TRUE;
}
if (strcmp(args[0], "console") == 0) {
prefs_set_string(PREF_STATUSES_CONSOLE, args[1]);
if (strcmp(args[1], "all") == 0) {
cons_show("All presence updates will appear in the console.");
} else if (strcmp(args[1], "online") == 0) {
cons_show("Only online/offline presence updates will appear in the console.");
} else {
cons_show("Presence updates will not appear in the console.");
}
}
if (strcmp(args[0], "chat") == 0) {
prefs_set_string(PREF_STATUSES_CHAT, args[1]);
if (strcmp(args[1], "all") == 0) {
cons_show("All presence updates will appear in chat windows.");
} else if (strcmp(args[1], "online") == 0) {
cons_show("Only online/offline presence updates will appear in chat windows.");
} else {
cons_show("Presence updates will not appear in chat windows.");
}
}
if (strcmp(args[0], "room") == 0) {
prefs_set_string(PREF_STATUSES_MUC, args[1]);
if (strcmp(args[1], "all") == 0) {
cons_show("All presence updates will appear in chat room windows.");
} else if (strcmp(args[1], "online") == 0) {
cons_show("Only join/leave presence updates will appear in chat room windows.");
} else {
cons_show("Presence updates will not appear in chat room windows.");
}
}
return TRUE;
}
@ -5740,59 +5787,6 @@ cmd_priority(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
gboolean
cmd_statuses(ProfWin *window, const char *const command, gchar **args)
{
if (strcmp(args[0], "console") != 0 &&
strcmp(args[0], "chat") != 0 &&
strcmp(args[0], "muc") != 0) {
cons_bad_cmd_usage(command);
return TRUE;
}
if (strcmp(args[1], "all") != 0 &&
strcmp(args[1], "online") != 0 &&
strcmp(args[1], "none") != 0) {
cons_bad_cmd_usage(command);
return TRUE;
}
if (strcmp(args[0], "console") == 0) {
prefs_set_string(PREF_STATUSES_CONSOLE, args[1]);
if (strcmp(args[1], "all") == 0) {
cons_show("All presence updates will appear in the console.");
} else if (strcmp(args[1], "online") == 0) {
cons_show("Only online/offline presence updates will appear in the console.");
} else {
cons_show("Presence updates will not appear in the console.");
}
}
if (strcmp(args[0], "chat") == 0) {
prefs_set_string(PREF_STATUSES_CHAT, args[1]);
if (strcmp(args[1], "all") == 0) {
cons_show("All presence updates will appear in chat windows.");
} else if (strcmp(args[1], "online") == 0) {
cons_show("Only online/offline presence updates will appear in chat windows.");
} else {
cons_show("Presence updates will not appear in chat windows.");
}
}
if (strcmp(args[0], "muc") == 0) {
prefs_set_string(PREF_STATUSES_MUC, args[1]);
if (strcmp(args[1], "all") == 0) {
cons_show("All presence updates will appear in chat room windows.");
} else if (strcmp(args[1], "online") == 0) {
cons_show("Only join/leave presence updates will appear in chat room windows.");
} else {
cons_show("Presence updates will not appear in chat room windows.");
}
}
return TRUE;
}
gboolean
cmd_vercheck(ProfWin *window, const char *const command, gchar **args)
{

1
src/command/cmd_funcs.h
View File

@ -125,7 +125,6 @@ gboolean cmd_software(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_splash(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_states(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_status(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_statuses(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_sub(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_theme(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_tiny(ProfWin *window, const char *const command, gchar **args);

33
src/ui/console.c
View File

@ -1176,9 +1176,21 @@ void
cons_presence_setting(void)
{
if (prefs_get_boolean(PREF_PRESENCE))
cons_show("Contact presence (/presence) : ON");
cons_show("Titlebar presence (/presence) : ON");
else
cons_show("Contact presence (/presence) : OFF");
cons_show("Titlebar presence (/presence) : OFF");
char *console = prefs_get_string(PREF_STATUSES_CONSOLE);
char *chat = prefs_get_string(PREF_STATUSES_CHAT);
char *room = prefs_get_string(PREF_STATUSES_MUC);
cons_show("Console presence (/presence) : %s", console);
cons_show("Chat presence (/presence) : %s", chat);
cons_show("Room presence (/presence) : %s", room);
prefs_free_string(console);
prefs_free_string(chat);
prefs_free_string(room);
}
void
@ -1315,22 +1327,6 @@ cons_vercheck_setting(void)
cons_show("Version checking (/vercheck) : OFF");
}
void
cons_statuses_setting(void)
{
char *console = prefs_get_string(PREF_STATUSES_CONSOLE);
char *chat = prefs_get_string(PREF_STATUSES_CHAT);
char *muc = prefs_get_string(PREF_STATUSES_MUC);
cons_show("Console statuses (/statuses) : %s", console);
cons_show("Chat statuses (/statuses) : %s", chat);
cons_show("MUC statuses (/statuses) : %s", muc);
prefs_free_string(console);
prefs_free_string(chat);
prefs_free_string(muc);
}
void
cons_titlebar_setting(void)
{
@ -1532,7 +1528,6 @@ cons_show_ui_prefs(void)
cons_time_setting();
cons_resource_setting();
cons_vercheck_setting();
cons_statuses_setting();
cons_console_setting();
cons_occupants_setting();
cons_roster_setting();

1
src/ui/ui.h
View File

@ -297,7 +297,6 @@ void cons_presence_setting(void);
void cons_wrap_setting(void);
void cons_winstidy_setting(void);
void cons_time_setting(void);
void cons_statuses_setting(void);
void cons_titlebar_setting(void);
void cons_notify_setting(void);
void cons_show_desktop_prefs(void);

68
tests/unittests/test_cmd_statuses.c → tests/unittests/test_cmd_presence.c
View File

@ -13,55 +13,55 @@
#include "command/cmd_funcs.h"
#define CMD_STATUSES "/statuses"
#define CMD_PRESENCE "/presence"
void cmd_statuses_shows_usage_when_bad_subcmd(void **state)
void cmd_presence_shows_usage_when_bad_subcmd(void **state)
{
gchar *args[] = { "badcmd", NULL };
expect_string(cons_bad_cmd_usage, cmd, CMD_STATUSES);
expect_string(cons_bad_cmd_usage, cmd, CMD_PRESENCE);
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
assert_true(result);
}
void cmd_statuses_shows_usage_when_bad_console_setting(void **state)
void cmd_presence_shows_usage_when_bad_console_setting(void **state)
{
gchar *args[] = { "console", "badsetting", NULL };
expect_string(cons_bad_cmd_usage, cmd, CMD_STATUSES);
expect_string(cons_bad_cmd_usage, cmd, CMD_PRESENCE);
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
assert_true(result);
}
void cmd_statuses_shows_usage_when_bad_chat_setting(void **state)
void cmd_presence_shows_usage_when_bad_chat_setting(void **state)
{
gchar *args[] = { "chat", "badsetting", NULL };
expect_string(cons_bad_cmd_usage, cmd, CMD_STATUSES);
expect_string(cons_bad_cmd_usage, cmd, CMD_PRESENCE);
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
assert_true(result);
}
void cmd_statuses_shows_usage_when_bad_muc_setting(void **state)
void cmd_presence_shows_usage_when_bad_muc_setting(void **state)
{
gchar *args[] = { "muc", "badsetting", NULL };
expect_string(cons_bad_cmd_usage, cmd, CMD_STATUSES);
expect_string(cons_bad_cmd_usage, cmd, CMD_PRESENCE);
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
assert_true(result);
}
void cmd_statuses_console_sets_all(void **state)
void cmd_presence_console_sets_all(void **state)
{
gchar *args[] = { "console", "all", NULL };
expect_cons_show("All presence updates will appear in the console.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
@ -69,13 +69,13 @@ void cmd_statuses_console_sets_all(void **state)
assert_true(result);
}
void cmd_statuses_console_sets_online(void **state)
void cmd_presence_console_sets_online(void **state)
{
gchar *args[] = { "console", "online", NULL };
expect_cons_show("Only online/offline presence updates will appear in the console.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
@ -83,13 +83,13 @@ void cmd_statuses_console_sets_online(void **state)
assert_true(result);
}
void cmd_statuses_console_sets_none(void **state)
void cmd_presence_console_sets_none(void **state)
{
gchar *args[] = { "console", "none", NULL };
expect_cons_show("Presence updates will not appear in the console.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
@ -97,13 +97,13 @@ void cmd_statuses_console_sets_none(void **state)
assert_true(result);
}
void cmd_statuses_chat_sets_all(void **state)
void cmd_presence_chat_sets_all(void **state)
{
gchar *args[] = { "chat", "all", NULL };
expect_cons_show("All presence updates will appear in chat windows.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
@ -111,13 +111,13 @@ void cmd_statuses_chat_sets_all(void **state)
assert_true(result);
}
void cmd_statuses_chat_sets_online(void **state)
void cmd_presence_chat_sets_online(void **state)
{
gchar *args[] = { "chat", "online", NULL };
expect_cons_show("Only online/offline presence updates will appear in chat windows.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
@ -125,13 +125,13 @@ void cmd_statuses_chat_sets_online(void **state)
assert_true(result);
}
void cmd_statuses_chat_sets_none(void **state)
void cmd_presence_chat_sets_none(void **state)
{
gchar *args[] = { "chat", "none", NULL };
expect_cons_show("Presence updates will not appear in chat windows.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
@ -139,13 +139,13 @@ void cmd_statuses_chat_sets_none(void **state)
assert_true(result);
}
void cmd_statuses_muc_sets_all(void **state)
void cmd_presence_room_sets_all(void **state)
{
gchar *args[] = { "muc", "all", NULL };
gchar *args[] = { "room", "all", NULL };
expect_cons_show("All presence updates will appear in chat room windows.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
@ -153,13 +153,13 @@ void cmd_statuses_muc_sets_all(void **state)
assert_true(result);
}
void cmd_statuses_muc_sets_online(void **state)
void cmd_presence_room_sets_online(void **state)
{
gchar *args[] = { "muc", "online", NULL };
gchar *args[] = { "room", "online", NULL };
expect_cons_show("Only join/leave presence updates will appear in chat room windows.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
@ -167,13 +167,13 @@ void cmd_statuses_muc_sets_online(void **state)
assert_true(result);
}
void cmd_statuses_muc_sets_none(void **state)
void cmd_presence_room_sets_none(void **state)
{
gchar *args[] = { "muc", "none", NULL };
gchar *args[] = { "room", "none", NULL };
expect_cons_show("Presence updates will not appear in chat room windows.");
gboolean result = cmd_statuses(NULL, CMD_STATUSES, args);
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char *setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);

13
tests/unittests/test_cmd_presence.h Normal file
View File

@ -0,0 +1,13 @@
void cmd_presence_shows_usage_when_bad_subcmd(void **state);
void cmd_presence_shows_usage_when_bad_console_setting(void **state);
void cmd_presence_shows_usage_when_bad_chat_setting(void **state);
void cmd_presence_shows_usage_when_bad_muc_setting(void **state);
void cmd_presence_console_sets_all(void **state);
void cmd_presence_console_sets_online(void **state);
void cmd_presence_console_sets_none(void **state);
void cmd_presence_chat_sets_all(void **state);
void cmd_presence_chat_sets_online(void **state);
void cmd_presence_chat_sets_none(void **state);
void cmd_presence_room_sets_all(void **state);
void cmd_presence_room_sets_online(void **state);
void cmd_presence_room_sets_none(void **state);

13
tests/unittests/test_cmd_statuses.h
View File

@ -1,13 +0,0 @@
void cmd_statuses_shows_usage_when_bad_subcmd(void **state);
void cmd_statuses_shows_usage_when_bad_console_setting(void **state);
void cmd_statuses_shows_usage_when_bad_chat_setting(void **state);
void cmd_statuses_shows_usage_when_bad_muc_setting(void **state);
void cmd_statuses_console_sets_all(void **state);
void cmd_statuses_console_sets_online(void **state);
void cmd_statuses_console_sets_none(void **state);
void cmd_statuses_chat_sets_all(void **state);
void cmd_statuses_chat_sets_online(void **state);
void cmd_statuses_chat_sets_none(void **state);
void cmd_statuses_muc_sets_all(void **state);
void cmd_statuses_muc_sets_online(void **state);
void cmd_statuses_muc_sets_none(void **state);

28
tests/unittests/unittests.c
View File

@ -18,7 +18,7 @@
#include "test_cmd_account.h"
#include "test_cmd_rooms.h"
#include "test_cmd_sub.h"
#include "test_cmd_statuses.h"
#include "test_cmd_presence.h"
#include "test_cmd_otr.h"
#include "test_cmd_pgp.h"
#include "test_jid.h"
@ -395,35 +395,35 @@ int main(int argc, char* argv[]) {
unit_test(contact_available_when_highest_priority_online),
unit_test(contact_available_when_highest_priority_chat),
unit_test(cmd_statuses_shows_usage_when_bad_subcmd),
unit_test(cmd_statuses_shows_usage_when_bad_console_setting),
unit_test(cmd_statuses_shows_usage_when_bad_chat_setting),
unit_test(cmd_statuses_shows_usage_when_bad_muc_setting),
unit_test_setup_teardown(cmd_statuses_console_sets_all,
unit_test(cmd_presence_shows_usage_when_bad_subcmd),
unit_test(cmd_presence_shows_usage_when_bad_console_setting),
unit_test(cmd_presence_shows_usage_when_bad_chat_setting),
unit_test(cmd_presence_shows_usage_when_bad_muc_setting),
unit_test_setup_teardown(cmd_presence_console_sets_all,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_console_sets_online,
unit_test_setup_teardown(cmd_presence_console_sets_online,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_console_sets_none,
unit_test_setup_teardown(cmd_presence_console_sets_none,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_chat_sets_all,
unit_test_setup_teardown(cmd_presence_chat_sets_all,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_chat_sets_online,
unit_test_setup_teardown(cmd_presence_chat_sets_online,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_chat_sets_none,
unit_test_setup_teardown(cmd_presence_chat_sets_none,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_muc_sets_all,
unit_test_setup_teardown(cmd_presence_room_sets_all,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_muc_sets_online,
unit_test_setup_teardown(cmd_presence_room_sets_online,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_muc_sets_none,
unit_test_setup_teardown(cmd_presence_room_sets_none,
load_preferences,
close_preferences),