aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-09-25 23:31:54 +01:00
commit 46892e0c76
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/plugins.c
View File

@ -839,4 +839,6 @@ plugins_shutdown(void)
plugin_settings_close(); plugin_settings_close();
callbacks_close(); callbacks_close();
disco_close(); disco_close();
g_hash_table_destroy(plugins);
plugins = NULL;
} }

8
tests/unittests/test_server_events.c
View File

@ -17,6 +17,7 @@
void console_shows_online_presence_when_set_online(void **state) void console_shows_online_presence_when_set_online(void **state)
{ {
prefs_set_string(PREF_STATUSES_CONSOLE, "online"); prefs_set_string(PREF_STATUSES_CONSOLE, "online");
plugins_init();
roster_create(); roster_create();
char *barejid = "test1@server"; char *barejid = "test1@server";
roster_add(barejid, "bob", NULL, "both", FALSE); roster_add(barejid, "bob", NULL, "both", FALSE);
@ -29,11 +30,13 @@ void console_shows_online_presence_when_set_online(void **state)
sv_ev_contact_online(barejid, resource, NULL, NULL); sv_ev_contact_online(barejid, resource, NULL, NULL);
roster_destroy(); roster_destroy();
plugins_shutdown();
} }
void console_shows_online_presence_when_set_all(void **state) void console_shows_online_presence_when_set_all(void **state)
{ {
prefs_set_string(PREF_STATUSES_CONSOLE, "all"); prefs_set_string(PREF_STATUSES_CONSOLE, "all");
plugins_init();
roster_create(); roster_create();
char *barejid = "test1@server"; char *barejid = "test1@server";
roster_add(barejid, "bob", NULL, "both", FALSE); roster_add(barejid, "bob", NULL, "both", FALSE);
@ -46,11 +49,13 @@ void console_shows_online_presence_when_set_all(void **state)
sv_ev_contact_online(barejid, resource, NULL, NULL); sv_ev_contact_online(barejid, resource, NULL, NULL);
roster_destroy(); roster_destroy();
plugins_shutdown();
} }
void console_shows_dnd_presence_when_set_all(void **state) void console_shows_dnd_presence_when_set_all(void **state)
{ {
prefs_set_string(PREF_STATUSES_CONSOLE, "all"); prefs_set_string(PREF_STATUSES_CONSOLE, "all");
plugins_init();
roster_create(); roster_create();
char *barejid = "test1@server"; char *barejid = "test1@server";
roster_add(barejid, "bob", NULL, "both", FALSE); roster_add(barejid, "bob", NULL, "both", FALSE);
@ -63,10 +68,12 @@ void console_shows_dnd_presence_when_set_all(void **state)
sv_ev_contact_online(barejid, resource, NULL, NULL); sv_ev_contact_online(barejid, resource, NULL, NULL);
roster_destroy(); roster_destroy();
plugins_shutdown();
} }
void handle_offline_removes_chat_session(void **state) void handle_offline_removes_chat_session(void **state)
{ {
plugins_init();
roster_create(); roster_create();
chat_sessions_init(); chat_sessions_init();
char *barejid = "friend@server.chat.com"; char *barejid = "friend@server.chat.com";
@ -85,6 +92,7 @@ void handle_offline_removes_chat_session(void **state)
roster_destroy(); roster_destroy();
chat_sessions_clear(); chat_sessions_clear();
plugins_shutdown();
} }
void lost_connection_clears_chat_sessions(void **state) void lost_connection_clears_chat_sessions(void **state)

4
tests/unittests/unittests.c
View File

@ -429,7 +429,9 @@ int main(int argc, char* argv[]) {
unit_test_setup_teardown(console_shows_dnd_presence_when_set_all, unit_test_setup_teardown(console_shows_dnd_presence_when_set_all,
load_preferences, load_preferences,
close_preferences), close_preferences),
unit_test(handle_offline_removes_chat_session), unit_test_setup_teardown(handle_offline_removes_chat_session,
load_preferences,
close_preferences),
unit_test(lost_connection_clears_chat_sessions), unit_test(lost_connection_clears_chat_sessions),
unit_test(cmd_alias_add_shows_usage_when_no_args), unit_test(cmd_alias_add_shows_usage_when_no_args),