diff --git a/Makefile.am b/Makefile.am index dc17499c..7301e5b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,6 +124,7 @@ unittest_sources = \ src/event/server_events.c src/event/server_events.h \ src/event/client_events.c src/event/client_events.h \ src/ui/tray.h src/ui/tray.c \ + tests/prof_cmocka.h \ tests/unittests/xmpp/stub_vcard.c \ tests/unittests/xmpp/stub_avatar.c \ tests/unittests/xmpp/stub_ox.c \ @@ -170,6 +171,7 @@ unittest_sources = \ tests/unittests/unittests.c functionaltest_sources = \ + tests/prof_cmocka.h \ tests/functionaltests/proftest.c tests/functionaltests/proftest.h \ tests/functionaltests/test_connect.c tests/functionaltests/test_connect.h \ tests/functionaltests/test_ping.c tests/functionaltests/test_ping.h \ @@ -284,6 +286,7 @@ endif TESTS = tests/unittests/unittests check_PROGRAMS = tests/unittests/unittests +tests_unittests_unittests_CPPFLAGS = -Itests/ tests_unittests_unittests_SOURCES = $(unittest_sources) tests_unittests_unittests_LDADD = -lcmocka diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c index 3106a0e2..ea957e49 100644 --- a/tests/functionaltests/functionaltests.c +++ b/tests/functionaltests/functionaltests.c @@ -1,10 +1,7 @@ -#include #include #include #include -#include -#include -#include +#include "prof_cmocka.h" #include #include "config.h" diff --git a/tests/functionaltests/proftest.c b/tests/functionaltests/proftest.c index 2fe904e4..29c1d4f4 100644 --- a/tests/functionaltests/proftest.c +++ b/tests/functionaltests/proftest.c @@ -2,11 +2,8 @@ #include #include -#include -#include -#include #include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/functionaltests/test_carbons.c b/tests/functionaltests/test_carbons.c index 7926a76f..ddf6194d 100644 --- a/tests/functionaltests/test_carbons.c +++ b/tests/functionaltests/test_carbons.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_chat_session.c b/tests/functionaltests/test_chat_session.c index 6589ae36..355b977f 100644 --- a/tests/functionaltests/test_chat_session.c +++ b/tests/functionaltests/test_chat_session.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_connect.c b/tests/functionaltests/test_connect.c index e7dae21e..571293dc 100644 --- a/tests/functionaltests/test_connect.c +++ b/tests/functionaltests/test_connect.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_disconnect.c b/tests/functionaltests/test_disconnect.c index 83861980..2827805f 100644 --- a/tests/functionaltests/test_disconnect.c +++ b/tests/functionaltests/test_disconnect.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_message.c b/tests/functionaltests/test_message.c index d73f3bb4..ab477512 100644 --- a/tests/functionaltests/test_message.c +++ b/tests/functionaltests/test_message.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_muc.c b/tests/functionaltests/test_muc.c index 6150c77c..c85b7f3e 100644 --- a/tests/functionaltests/test_muc.c +++ b/tests/functionaltests/test_muc.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_ping.c b/tests/functionaltests/test_ping.c index 834e4447..a5aeba3b 100644 --- a/tests/functionaltests/test_ping.c +++ b/tests/functionaltests/test_ping.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_presence.c b/tests/functionaltests/test_presence.c index 91bd2644..0bd1915d 100644 --- a/tests/functionaltests/test_presence.c +++ b/tests/functionaltests/test_presence.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_receipts.c b/tests/functionaltests/test_receipts.c index 59054ee8..3debd977 100644 --- a/tests/functionaltests/test_receipts.c +++ b/tests/functionaltests/test_receipts.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_rooms.c b/tests/functionaltests/test_rooms.c index 49b1d892..dbe861e1 100644 --- a/tests/functionaltests/test_rooms.c +++ b/tests/functionaltests/test_rooms.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_roster.c b/tests/functionaltests/test_roster.c index c16764be..e6453fe1 100644 --- a/tests/functionaltests/test_roster.c +++ b/tests/functionaltests/test_roster.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/functionaltests/test_software.c b/tests/functionaltests/test_software.c index 00bccf61..c382d290 100644 --- a/tests/functionaltests/test_software.c +++ b/tests/functionaltests/test_software.c @@ -1,8 +1,5 @@ #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/prof_cmocka.h b/tests/prof_cmocka.h new file mode 100644 index 00000000..c8561404 --- /dev/null +++ b/tests/prof_cmocka.h @@ -0,0 +1,5 @@ +#include +#include +#include +#include +#include diff --git a/tests/unittests/chatlog/stub_chatlog.c b/tests/unittests/chatlog/stub_chatlog.c index 2d8eb382..9a53f432 100644 --- a/tests/unittests/chatlog/stub_chatlog.c +++ b/tests/unittests/chatlog/stub_chatlog.c @@ -21,8 +21,7 @@ */ #include -#include -#include +#include "prof_cmocka.h" #include diff --git a/tests/unittests/config/stub_accounts.c b/tests/unittests/config/stub_accounts.c index 981d0180..c805e3ba 100644 --- a/tests/unittests/config/stub_accounts.c +++ b/tests/unittests/config/stub_accounts.c @@ -1,8 +1,4 @@ -#include -#include -#include -#include -#include +#include "prof_cmocka.h" #include "common.h" #include "config/account.h" diff --git a/tests/unittests/database/stub_database.c b/tests/unittests/database/stub_database.c index c1e5c7b3..c3827b46 100644 --- a/tests/unittests/database/stub_database.c +++ b/tests/unittests/database/stub_database.c @@ -21,8 +21,7 @@ */ #include -#include -#include +#include "prof_cmocka.h" #include "database.h" diff --git a/tests/unittests/helpers.c b/tests/unittests/helpers.c index f567bcd5..83de34a0 100644 --- a/tests/unittests/helpers.c +++ b/tests/unittests/helpers.c @@ -1,8 +1,5 @@ -#include -#include -#include #include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/log/stub_log.c b/tests/unittests/log/stub_log.c index f0f67e47..aba5a603 100644 --- a/tests/unittests/log/stub_log.c +++ b/tests/unittests/log/stub_log.c @@ -20,10 +20,8 @@ * */ -#include #include -#include -#include +#include "prof_cmocka.h" #include "log.h" diff --git a/tests/unittests/otr/stub_otr.c b/tests/unittests/otr/stub_otr.c index 291db41c..8069ee7d 100644 --- a/tests/unittests/otr/stub_otr.c +++ b/tests/unittests/otr/stub_otr.c @@ -2,10 +2,7 @@ #include #include -#include -#include -#include -#include +#include "prof_cmocka.h" #include "config/account.h" diff --git a/tests/unittests/test_autocomplete.c b/tests/unittests/test_autocomplete.c index 0e307351..3988aaa4 100644 --- a/tests/unittests/test_autocomplete.c +++ b/tests/unittests/test_autocomplete.c @@ -1,9 +1,5 @@ #include -#include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include "xmpp/contact.h" diff --git a/tests/unittests/test_callbacks.c b/tests/unittests/test_callbacks.c index 678c6415..9796f489 100644 --- a/tests/unittests/test_callbacks.c +++ b/tests/unittests/test_callbacks.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_chat_session.c b/tests/unittests/test_chat_session.c index 2de18c08..86ce0743 100644 --- a/tests/unittests/test_chat_session.c +++ b/tests/unittests/test_chat_session.c @@ -1,10 +1,6 @@ -#include #include -#include -#include -#include +#include "prof_cmocka.h" #include -#include #include "xmpp/chat_session.h" diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c index 76f5a594..46783820 100644 --- a/tests/unittests/test_cmd_account.c +++ b/tests/unittests/test_cmd_account.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_alias.c b/tests/unittests/test_cmd_alias.c index d23816bd..c86733a2 100644 --- a/tests/unittests/test_cmd_alias.c +++ b/tests/unittests/test_cmd_alias.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c index c77e0bf1..168ce8ce 100644 --- a/tests/unittests/test_cmd_bookmark.c +++ b/tests/unittests/test_cmd_bookmark.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c index 98e1884d..7f6d54ea 100644 --- a/tests/unittests/test_cmd_connect.c +++ b/tests/unittests/test_cmd_connect.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c index 227c7fbc..e524577a 100644 --- a/tests/unittests/test_cmd_disconnect.c +++ b/tests/unittests/test_cmd_disconnect.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c index e933dc89..75440332 100644 --- a/tests/unittests/test_cmd_join.c +++ b/tests/unittests/test_cmd_join.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c index 7824cd9d..7c1850df 100644 --- a/tests/unittests/test_cmd_otr.c +++ b/tests/unittests/test_cmd_otr.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_pgp.c b/tests/unittests/test_cmd_pgp.c index 35df812f..71253c49 100644 --- a/tests/unittests/test_cmd_pgp.c +++ b/tests/unittests/test_cmd_pgp.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_presence.c b/tests/unittests/test_cmd_presence.c index 3d157ff1..8d386097 100644 --- a/tests/unittests/test_cmd_presence.c +++ b/tests/unittests/test_cmd_presence.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_rooms.c b/tests/unittests/test_cmd_rooms.c index 0800bf20..ef2e6b48 100644 --- a/tests/unittests/test_cmd_rooms.c +++ b/tests/unittests/test_cmd_rooms.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c index d848235b..aadfedc4 100644 --- a/tests/unittests/test_cmd_roster.c +++ b/tests/unittests/test_cmd_roster.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_cmd_sub.c b/tests/unittests/test_cmd_sub.c index 2db13337..c7386112 100644 --- a/tests/unittests/test_cmd_sub.c +++ b/tests/unittests/test_cmd_sub.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_common.c b/tests/unittests/test_common.c index e340fcf3..889b2202 100644 --- a/tests/unittests/test_common.c +++ b/tests/unittests/test_common.c @@ -1,11 +1,7 @@ #include "xmpp/resource.h" #include "common.h" -#include -#include -#include -#include +#include "prof_cmocka.h" #include -#include void replace_one_substr(void** state) diff --git a/tests/unittests/test_contact.c b/tests/unittests/test_contact.c index 849c9bc0..3f6caa12 100644 --- a/tests/unittests/test_contact.c +++ b/tests/unittests/test_contact.c @@ -1,9 +1,6 @@ #include -#include #include -#include -#include -#include +#include "prof_cmocka.h" #include #include "xmpp/contact.h" diff --git a/tests/unittests/test_form.c b/tests/unittests/test_form.c index 88bf9d55..583babf3 100644 --- a/tests/unittests/test_form.c +++ b/tests/unittests/test_form.c @@ -1,8 +1,5 @@ -#include #include -#include -#include -#include +#include "prof_cmocka.h" #include #include "xmpp/form.h" diff --git a/tests/unittests/test_jid.c b/tests/unittests/test_jid.c index 77886e4a..7bc2137e 100644 --- a/tests/unittests/test_jid.c +++ b/tests/unittests/test_jid.c @@ -1,8 +1,4 @@ -#include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include "xmpp/jid.h" diff --git a/tests/unittests/test_keyhandlers.c b/tests/unittests/test_keyhandlers.c index 6d95f0cb..ff7d6a93 100644 --- a/tests/unittests/test_keyhandlers.c +++ b/tests/unittests/test_keyhandlers.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include diff --git a/tests/unittests/test_muc.c b/tests/unittests/test_muc.c index 57fd79e8..bf396619 100644 --- a/tests/unittests/test_muc.c +++ b/tests/unittests/test_muc.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include "xmpp/muc.h" diff --git a/tests/unittests/test_parser.c b/tests/unittests/test_parser.c index 8019097d..2783e8d0 100644 --- a/tests/unittests/test_parser.c +++ b/tests/unittests/test_parser.c @@ -1,8 +1,4 @@ -#include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include "tools/parser.h" diff --git a/tests/unittests/test_plugins_disco.c b/tests/unittests/test_plugins_disco.c index 880a09b1..a21ae94c 100644 --- a/tests/unittests/test_plugins_disco.c +++ b/tests/unittests/test_plugins_disco.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include "plugins/disco.h" diff --git a/tests/unittests/test_preferences.c b/tests/unittests/test_preferences.c index 1eb2ba36..7c662a34 100644 --- a/tests/unittests/test_preferences.c +++ b/tests/unittests/test_preferences.c @@ -1,8 +1,4 @@ -#include -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/test_roster_list.c b/tests/unittests/test_roster_list.c index 185a9c72..7fbaf394 100644 --- a/tests/unittests/test_roster_list.c +++ b/tests/unittests/test_roster_list.c @@ -1,11 +1,7 @@ #include -#include #include -#include -#include -#include +#include "prof_cmocka.h" #include -#include #include "xmpp/contact.h" #include "xmpp/roster_list.h" diff --git a/tests/unittests/test_server_events.c b/tests/unittests/test_server_events.c index fbed077a..4f00fd1b 100644 --- a/tests/unittests/test_server_events.c +++ b/tests/unittests/test_server_events.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 6e31382f..d15177d6 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -3,8 +3,7 @@ #include #include -#include -#include +#include "prof_cmocka.h" #include "ui/window.h" #include "ui/ui.h" diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c index 88e1ec98..69fbd4bf 100644 --- a/tests/unittests/unittests.c +++ b/tests/unittests/unittests.c @@ -1,10 +1,7 @@ -#include #include #include #include -#include -#include -#include +#include "prof_cmocka.h" #include #include #include diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c index 5af8c5c2..76a072e9 100644 --- a/tests/unittests/xmpp/stub_xmpp.c +++ b/tests/unittests/xmpp/stub_xmpp.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "prof_cmocka.h" #include "xmpp/xmpp.h"