diff --git a/Makefile.am b/Makefile.am index f2abd8ed..5a175c8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,31 +142,31 @@ unittest_sources = \ tests/unittests/tools/stub_aesgcm_download.c \ tests/unittests/tools/stub_plugin_download.c \ tests/unittests/helpers.c tests/unittests/helpers.h \ - tests/unittests/test_form.c tests/unittests/test_form.h \ + tests/unittests/xmpp/test_form.c tests/unittests/xmpp/test_form.h \ tests/unittests/test_common.c tests/unittests/test_common.h \ - tests/unittests/test_autocomplete.c tests/unittests/test_autocomplete.h \ - tests/unittests/test_jid.c tests/unittests/test_jid.h \ - tests/unittests/test_parser.c tests/unittests/test_parser.h \ - tests/unittests/test_roster_list.c tests/unittests/test_roster_list.h \ - tests/unittests/test_chat_session.c tests/unittests/test_chat_session.h \ - tests/unittests/test_contact.c tests/unittests/test_contact.h \ - 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_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 \ - tests/unittests/test_cmd_account.c tests/unittests/test_cmd_account.h \ - tests/unittests/test_cmd_sub.c tests/unittests/test_cmd_sub.h \ - tests/unittests/test_cmd_bookmark.c tests/unittests/test_cmd_bookmark.h \ - tests/unittests/test_cmd_otr.c tests/unittests/test_cmd_otr.h \ - tests/unittests/test_cmd_pgp.c tests/unittests/test_cmd_pgp.h \ - tests/unittests/test_cmd_join.c tests/unittests/test_cmd_join.h \ - tests/unittests/test_cmd_roster.c tests/unittests/test_cmd_roster.h \ - tests/unittests/test_cmd_disconnect.c tests/unittests/test_cmd_disconnect.h \ - tests/unittests/test_callbacks.c tests/unittests/test_callbacks.h \ - tests/unittests/test_plugins_disco.c tests/unittests/test_plugins_disco.h \ + tests/unittests/tools/test_autocomplete.c tests/unittests/tools/test_autocomplete.h \ + tests/unittests/xmpp/test_jid.c tests/unittests/xmpp/test_jid.h \ + tests/unittests/tools/test_parser.c tests/unittests/tools/test_parser.h \ + tests/unittests/xmpp/test_roster_list.c tests/unittests/xmpp/test_roster_list.h \ + tests/unittests/xmpp/test_chat_session.c tests/unittests/xmpp/test_chat_session.h \ + tests/unittests/xmpp/test_contact.c tests/unittests/xmpp/test_contact.h \ + tests/unittests/config/test_preferences.c tests/unittests/config/test_preferences.h \ + tests/unittests/event/test_server_events.c tests/unittests/event/test_server_events.h \ + tests/unittests/xmpp/test_muc.c tests/unittests/xmpp/test_muc.h \ + tests/unittests/command/test_cmd_presence.c tests/unittests/command/test_cmd_presence.h \ + tests/unittests/command/test_cmd_alias.c tests/unittests/command/test_cmd_alias.h \ + tests/unittests/command/test_cmd_connect.c tests/unittests/command/test_cmd_connect.h \ + tests/unittests/command/test_cmd_rooms.c tests/unittests/command/test_cmd_rooms.h \ + tests/unittests/command/test_cmd_account.c tests/unittests/command/test_cmd_account.h \ + tests/unittests/command/test_cmd_sub.c tests/unittests/command/test_cmd_sub.h \ + tests/unittests/command/test_cmd_bookmark.c tests/unittests/command/test_cmd_bookmark.h \ + tests/unittests/command/test_cmd_otr.c tests/unittests/command/test_cmd_otr.h \ + tests/unittests/command/test_cmd_pgp.c tests/unittests/command/test_cmd_pgp.h \ + tests/unittests/command/test_cmd_join.c tests/unittests/command/test_cmd_join.h \ + tests/unittests/command/test_cmd_roster.c tests/unittests/command/test_cmd_roster.h \ + tests/unittests/command/test_cmd_disconnect.c tests/unittests/command/test_cmd_disconnect.h \ + tests/unittests/plugins/test_callbacks.c tests/unittests/plugins/test_callbacks.h \ + tests/unittests/plugins/test_plugins_disco.c tests/unittests/plugins/test_plugins_disco.h \ tests/unittests/unittests.c functionaltest_sources = \ @@ -285,7 +285,7 @@ endif TESTS = tests/unittests/unittests check_PROGRAMS = tests/unittests/unittests -tests_unittests_unittests_CPPFLAGS = -I$(srcdir)/tests/ +tests_unittests_unittests_CPPFLAGS = -I$(srcdir)/tests/ -I$(srcdir)/tests/unittests tests_unittests_unittests_SOURCES = $(unittest_sources) tests_unittests_unittests_LDADD = -lcmocka diff --git a/meson.build b/meson.build index 04ab74d1..733ea828 100644 --- a/meson.build +++ b/meson.build @@ -605,31 +605,31 @@ if get_option('tests') 'tests/unittests/tools/stub_aesgcm_download.c', 'tests/unittests/tools/stub_plugin_download.c', 'tests/unittests/helpers.c', - 'tests/unittests/test_form.c', + 'tests/unittests/xmpp/test_form.c', 'tests/unittests/test_common.c', - 'tests/unittests/test_autocomplete.c', - 'tests/unittests/test_jid.c', - 'tests/unittests/test_parser.c', - 'tests/unittests/test_roster_list.c', - 'tests/unittests/test_chat_session.c', - 'tests/unittests/test_contact.c', - 'tests/unittests/test_preferences.c', - 'tests/unittests/test_server_events.c', - 'tests/unittests/test_muc.c', - 'tests/unittests/test_cmd_presence.c', - 'tests/unittests/test_cmd_alias.c', - 'tests/unittests/test_cmd_connect.c', - 'tests/unittests/test_cmd_rooms.c', - 'tests/unittests/test_cmd_account.c', - 'tests/unittests/test_cmd_sub.c', - 'tests/unittests/test_cmd_bookmark.c', - 'tests/unittests/test_cmd_otr.c', - 'tests/unittests/test_cmd_pgp.c', - 'tests/unittests/test_cmd_join.c', - 'tests/unittests/test_cmd_roster.c', - 'tests/unittests/test_cmd_disconnect.c', - 'tests/unittests/test_callbacks.c', - 'tests/unittests/test_plugins_disco.c', + 'tests/unittests/tools/test_autocomplete.c', + 'tests/unittests/xmpp/test_jid.c', + 'tests/unittests/tools/test_parser.c', + 'tests/unittests/xmpp/test_roster_list.c', + 'tests/unittests/xmpp/test_chat_session.c', + 'tests/unittests/xmpp/test_contact.c', + 'tests/unittests/config/test_preferences.c', + 'tests/unittests/event/test_server_events.c', + 'tests/unittests/xmpp/test_muc.c', + 'tests/unittests/command/test_cmd_presence.c', + 'tests/unittests/command/test_cmd_alias.c', + 'tests/unittests/command/test_cmd_connect.c', + 'tests/unittests/command/test_cmd_rooms.c', + 'tests/unittests/command/test_cmd_account.c', + 'tests/unittests/command/test_cmd_sub.c', + 'tests/unittests/command/test_cmd_bookmark.c', + 'tests/unittests/command/test_cmd_otr.c', + 'tests/unittests/command/test_cmd_pgp.c', + 'tests/unittests/command/test_cmd_join.c', + 'tests/unittests/command/test_cmd_roster.c', + 'tests/unittests/command/test_cmd_disconnect.c', + 'tests/unittests/plugins/test_callbacks.c', + 'tests/unittests/plugins/test_plugins_disco.c', 'tests/unittests/unittests.c', ) @@ -666,7 +666,7 @@ if get_option('tests') 'unittests', unittest_sources, dependencies: profanity_deps + [cmocka_dep], - include_directories: [inc, include_directories('tests')], + include_directories: [inc, include_directories('tests'), include_directories('tests/unittests')], build_by_default: false, ) diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/command/test_cmd_account.c similarity index 100% rename from tests/unittests/test_cmd_account.c rename to tests/unittests/command/test_cmd_account.c diff --git a/tests/unittests/test_cmd_account.h b/tests/unittests/command/test_cmd_account.h similarity index 100% rename from tests/unittests/test_cmd_account.h rename to tests/unittests/command/test_cmd_account.h diff --git a/tests/unittests/test_cmd_alias.c b/tests/unittests/command/test_cmd_alias.c similarity index 100% rename from tests/unittests/test_cmd_alias.c rename to tests/unittests/command/test_cmd_alias.c diff --git a/tests/unittests/test_cmd_alias.h b/tests/unittests/command/test_cmd_alias.h similarity index 100% rename from tests/unittests/test_cmd_alias.h rename to tests/unittests/command/test_cmd_alias.h diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/command/test_cmd_bookmark.c similarity index 100% rename from tests/unittests/test_cmd_bookmark.c rename to tests/unittests/command/test_cmd_bookmark.c diff --git a/tests/unittests/test_cmd_bookmark.h b/tests/unittests/command/test_cmd_bookmark.h similarity index 100% rename from tests/unittests/test_cmd_bookmark.h rename to tests/unittests/command/test_cmd_bookmark.h diff --git a/tests/unittests/test_cmd_connect.c b/tests/unittests/command/test_cmd_connect.c similarity index 100% rename from tests/unittests/test_cmd_connect.c rename to tests/unittests/command/test_cmd_connect.c diff --git a/tests/unittests/test_cmd_connect.h b/tests/unittests/command/test_cmd_connect.h similarity index 100% rename from tests/unittests/test_cmd_connect.h rename to tests/unittests/command/test_cmd_connect.h diff --git a/tests/unittests/test_cmd_disconnect.c b/tests/unittests/command/test_cmd_disconnect.c similarity index 100% rename from tests/unittests/test_cmd_disconnect.c rename to tests/unittests/command/test_cmd_disconnect.c diff --git a/tests/unittests/test_cmd_disconnect.h b/tests/unittests/command/test_cmd_disconnect.h similarity index 100% rename from tests/unittests/test_cmd_disconnect.h rename to tests/unittests/command/test_cmd_disconnect.h diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/command/test_cmd_join.c similarity index 100% rename from tests/unittests/test_cmd_join.c rename to tests/unittests/command/test_cmd_join.c diff --git a/tests/unittests/test_cmd_join.h b/tests/unittests/command/test_cmd_join.h similarity index 100% rename from tests/unittests/test_cmd_join.h rename to tests/unittests/command/test_cmd_join.h diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/command/test_cmd_otr.c similarity index 100% rename from tests/unittests/test_cmd_otr.c rename to tests/unittests/command/test_cmd_otr.c diff --git a/tests/unittests/test_cmd_otr.h b/tests/unittests/command/test_cmd_otr.h similarity index 100% rename from tests/unittests/test_cmd_otr.h rename to tests/unittests/command/test_cmd_otr.h diff --git a/tests/unittests/test_cmd_pgp.c b/tests/unittests/command/test_cmd_pgp.c similarity index 100% rename from tests/unittests/test_cmd_pgp.c rename to tests/unittests/command/test_cmd_pgp.c diff --git a/tests/unittests/test_cmd_pgp.h b/tests/unittests/command/test_cmd_pgp.h similarity index 100% rename from tests/unittests/test_cmd_pgp.h rename to tests/unittests/command/test_cmd_pgp.h diff --git a/tests/unittests/test_cmd_presence.c b/tests/unittests/command/test_cmd_presence.c similarity index 100% rename from tests/unittests/test_cmd_presence.c rename to tests/unittests/command/test_cmd_presence.c diff --git a/tests/unittests/test_cmd_presence.h b/tests/unittests/command/test_cmd_presence.h similarity index 100% rename from tests/unittests/test_cmd_presence.h rename to tests/unittests/command/test_cmd_presence.h diff --git a/tests/unittests/test_cmd_rooms.c b/tests/unittests/command/test_cmd_rooms.c similarity index 100% rename from tests/unittests/test_cmd_rooms.c rename to tests/unittests/command/test_cmd_rooms.c diff --git a/tests/unittests/test_cmd_rooms.h b/tests/unittests/command/test_cmd_rooms.h similarity index 100% rename from tests/unittests/test_cmd_rooms.h rename to tests/unittests/command/test_cmd_rooms.h diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/command/test_cmd_roster.c similarity index 100% rename from tests/unittests/test_cmd_roster.c rename to tests/unittests/command/test_cmd_roster.c diff --git a/tests/unittests/test_cmd_roster.h b/tests/unittests/command/test_cmd_roster.h similarity index 100% rename from tests/unittests/test_cmd_roster.h rename to tests/unittests/command/test_cmd_roster.h diff --git a/tests/unittests/test_cmd_sub.c b/tests/unittests/command/test_cmd_sub.c similarity index 100% rename from tests/unittests/test_cmd_sub.c rename to tests/unittests/command/test_cmd_sub.c diff --git a/tests/unittests/test_cmd_sub.h b/tests/unittests/command/test_cmd_sub.h similarity index 100% rename from tests/unittests/test_cmd_sub.h rename to tests/unittests/command/test_cmd_sub.h diff --git a/tests/unittests/test_preferences.c b/tests/unittests/config/test_preferences.c similarity index 100% rename from tests/unittests/test_preferences.c rename to tests/unittests/config/test_preferences.c diff --git a/tests/unittests/test_preferences.h b/tests/unittests/config/test_preferences.h similarity index 100% rename from tests/unittests/test_preferences.h rename to tests/unittests/config/test_preferences.h diff --git a/tests/unittests/test_server_events.c b/tests/unittests/event/test_server_events.c similarity index 100% rename from tests/unittests/test_server_events.c rename to tests/unittests/event/test_server_events.c diff --git a/tests/unittests/test_server_events.h b/tests/unittests/event/test_server_events.h similarity index 100% rename from tests/unittests/test_server_events.h rename to tests/unittests/event/test_server_events.h diff --git a/tests/unittests/test_callbacks.c b/tests/unittests/plugins/test_callbacks.c similarity index 100% rename from tests/unittests/test_callbacks.c rename to tests/unittests/plugins/test_callbacks.c diff --git a/tests/unittests/test_callbacks.h b/tests/unittests/plugins/test_callbacks.h similarity index 100% rename from tests/unittests/test_callbacks.h rename to tests/unittests/plugins/test_callbacks.h diff --git a/tests/unittests/test_plugins_disco.c b/tests/unittests/plugins/test_plugins_disco.c similarity index 100% rename from tests/unittests/test_plugins_disco.c rename to tests/unittests/plugins/test_plugins_disco.c diff --git a/tests/unittests/test_plugins_disco.h b/tests/unittests/plugins/test_plugins_disco.h similarity index 100% rename from tests/unittests/test_plugins_disco.h rename to tests/unittests/plugins/test_plugins_disco.h diff --git a/tests/unittests/test_autocomplete.c b/tests/unittests/tools/test_autocomplete.c similarity index 100% rename from tests/unittests/test_autocomplete.c rename to tests/unittests/tools/test_autocomplete.c diff --git a/tests/unittests/test_autocomplete.h b/tests/unittests/tools/test_autocomplete.h similarity index 100% rename from tests/unittests/test_autocomplete.h rename to tests/unittests/tools/test_autocomplete.h diff --git a/tests/unittests/test_parser.c b/tests/unittests/tools/test_parser.c similarity index 100% rename from tests/unittests/test_parser.c rename to tests/unittests/tools/test_parser.c diff --git a/tests/unittests/test_parser.h b/tests/unittests/tools/test_parser.h similarity index 100% rename from tests/unittests/test_parser.h rename to tests/unittests/tools/test_parser.h diff --git a/tests/unittests/test_keyhandlers.c b/tests/unittests/ui/test_keyhandlers.c similarity index 100% rename from tests/unittests/test_keyhandlers.c rename to tests/unittests/ui/test_keyhandlers.c diff --git a/tests/unittests/test_keyhandlers.h b/tests/unittests/ui/test_keyhandlers.h similarity index 100% rename from tests/unittests/test_keyhandlers.h rename to tests/unittests/ui/test_keyhandlers.h diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c index 8bf25b9b..5f2cb89b 100644 --- a/tests/unittests/unittests.c +++ b/tests/unittests/unittests.c @@ -10,31 +10,31 @@ #include "config.h" #include "xmpp/chat_session.h" #include "helpers.h" -#include "test_autocomplete.h" -#include "test_chat_session.h" +#include "tools/test_autocomplete.h" +#include "xmpp/test_chat_session.h" #include "test_common.h" -#include "test_contact.h" -#include "test_cmd_connect.h" -#include "test_cmd_account.h" -#include "test_cmd_rooms.h" -#include "test_cmd_sub.h" -#include "test_cmd_presence.h" -#include "test_cmd_otr.h" -#include "test_cmd_pgp.h" -#include "test_jid.h" -#include "test_parser.h" -#include "test_roster_list.h" -#include "test_preferences.h" -#include "test_server_events.h" -#include "test_cmd_alias.h" -#include "test_cmd_bookmark.h" -#include "test_cmd_join.h" -#include "test_muc.h" -#include "test_cmd_roster.h" -#include "test_cmd_disconnect.h" -#include "test_form.h" -#include "test_callbacks.h" -#include "test_plugins_disco.h" +#include "xmpp/test_contact.h" +#include "command/test_cmd_connect.h" +#include "command/test_cmd_account.h" +#include "command/test_cmd_rooms.h" +#include "command/test_cmd_sub.h" +#include "command/test_cmd_presence.h" +#include "command/test_cmd_otr.h" +#include "command/test_cmd_pgp.h" +#include "xmpp/test_jid.h" +#include "tools/test_parser.h" +#include "xmpp/test_roster_list.h" +#include "config/test_preferences.h" +#include "event/test_server_events.h" +#include "command/test_cmd_alias.h" +#include "command/test_cmd_bookmark.h" +#include "command/test_cmd_join.h" +#include "xmpp/test_muc.h" +#include "command/test_cmd_roster.h" +#include "command/test_cmd_disconnect.h" +#include "xmpp/test_form.h" +#include "plugins/test_callbacks.h" +#include "plugins/test_plugins_disco.h" #define muc_unit_test(f) cmocka_unit_test_setup_teardown(f, muc_before_test, muc_after_test) diff --git a/tests/unittests/test_chat_session.c b/tests/unittests/xmpp/test_chat_session.c similarity index 100% rename from tests/unittests/test_chat_session.c rename to tests/unittests/xmpp/test_chat_session.c diff --git a/tests/unittests/test_chat_session.h b/tests/unittests/xmpp/test_chat_session.h similarity index 100% rename from tests/unittests/test_chat_session.h rename to tests/unittests/xmpp/test_chat_session.h diff --git a/tests/unittests/test_contact.c b/tests/unittests/xmpp/test_contact.c similarity index 100% rename from tests/unittests/test_contact.c rename to tests/unittests/xmpp/test_contact.c diff --git a/tests/unittests/test_contact.h b/tests/unittests/xmpp/test_contact.h similarity index 100% rename from tests/unittests/test_contact.h rename to tests/unittests/xmpp/test_contact.h diff --git a/tests/unittests/test_form.c b/tests/unittests/xmpp/test_form.c similarity index 100% rename from tests/unittests/test_form.c rename to tests/unittests/xmpp/test_form.c diff --git a/tests/unittests/test_form.h b/tests/unittests/xmpp/test_form.h similarity index 100% rename from tests/unittests/test_form.h rename to tests/unittests/xmpp/test_form.h diff --git a/tests/unittests/test_jid.c b/tests/unittests/xmpp/test_jid.c similarity index 100% rename from tests/unittests/test_jid.c rename to tests/unittests/xmpp/test_jid.c diff --git a/tests/unittests/test_jid.h b/tests/unittests/xmpp/test_jid.h similarity index 100% rename from tests/unittests/test_jid.h rename to tests/unittests/xmpp/test_jid.h diff --git a/tests/unittests/test_muc.c b/tests/unittests/xmpp/test_muc.c similarity index 100% rename from tests/unittests/test_muc.c rename to tests/unittests/xmpp/test_muc.c diff --git a/tests/unittests/test_muc.h b/tests/unittests/xmpp/test_muc.h similarity index 100% rename from tests/unittests/test_muc.h rename to tests/unittests/xmpp/test_muc.h diff --git a/tests/unittests/test_roster_list.c b/tests/unittests/xmpp/test_roster_list.c similarity index 100% rename from tests/unittests/test_roster_list.c rename to tests/unittests/xmpp/test_roster_list.c diff --git a/tests/unittests/test_roster_list.h b/tests/unittests/xmpp/test_roster_list.h similarity index 100% rename from tests/unittests/test_roster_list.h rename to tests/unittests/xmpp/test_roster_list.h