diff --git a/.gitignore b/.gitignore index c3d9a977..8a73f436 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ main_fragment.html toc_fragment.html stabbertests/stabbertestsuite stabbertests/stabbertestsuite.trs +unittests/unittests +unittests/unittests.trs diff --git a/Makefile.am b/Makefile.am index 5ac81f52..0c5f23ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ core_sources = \ src/config/preferences.c src/config/preferences.h \ src/config/theme.c src/config/theme.h -test_sources = \ +unittest_sources = \ src/contact.c src/contact.h src/common.c \ src/log.h src/profanity.c src/common.h \ src/profanity.h src/chat_session.c \ @@ -65,34 +65,34 @@ test_sources = \ src/event/server_events.c src/event/server_events.h \ src/event/client_events.c src/event/client_events.h \ src/event/ui_events.c src/event/ui_events.h \ - tests/xmpp/stub_xmpp.c \ - tests/ui/stub_ui.c \ - tests/log/stub_log.c \ - tests/config/stub_accounts.c \ - tests/helpers.c tests/helpers.h \ - tests/test_cmd_account.c tests/test_cmd_account.h \ - tests/test_cmd_alias.c tests/test_cmd_alias.h \ - tests/test_cmd_bookmark.c tests/test_cmd_bookmark.h \ - tests/test_cmd_connect.c tests/test_cmd_connect.h \ - tests/test_cmd_join.c tests/test_cmd_join.h \ - tests/test_cmd_otr.c tests/test_cmd_otr.h \ - tests/test_cmd_rooms.c tests/test_cmd_rooms.h \ - tests/test_cmd_roster.c tests/test_cmd_roster.h \ - tests/test_cmd_statuses.c tests/test_cmd_statuses.h \ - tests/test_cmd_sub.c tests/test_cmd_sub.h \ - tests/test_cmd_disconnect.c tests/test_cmd_disconnect.h \ - tests/test_common.c tests/test_common.h \ - tests/test_contact.c tests/test_contact.h \ - tests/test_form.c tests/test_form.h \ - tests/test_jid.c tests/test_jid.h \ - tests/test_muc.c tests/test_muc.h \ - tests/test_parser.c tests/test_parser.h \ - tests/test_preferences.c tests/test_preferences.h \ - tests/test_roster_list.c tests/test_roster_list.h \ - tests/test_server_events.c tests/test_server_events.h \ - tests/test_autocomplete.c tests/test_autocomplete.h \ - tests/test_chat_session.c tests/test_chat_session.h \ - tests/testsuite.c + unittests/xmpp/stub_xmpp.c \ + unittests/ui/stub_ui.c \ + unittests/log/stub_log.c \ + unittests/config/stub_accounts.c \ + unittests/helpers.c unittests/helpers.h \ + unittests/test_cmd_account.c unittests/test_cmd_account.h \ + unittests/test_cmd_alias.c unittests/test_cmd_alias.h \ + unittests/test_cmd_bookmark.c unittests/test_cmd_bookmark.h \ + unittests/test_cmd_connect.c unittests/test_cmd_connect.h \ + unittests/test_cmd_join.c unittests/test_cmd_join.h \ + unittests/test_cmd_otr.c unittests/test_cmd_otr.h \ + unittests/test_cmd_rooms.c unittests/test_cmd_rooms.h \ + unittests/test_cmd_roster.c unittests/test_cmd_roster.h \ + unittests/test_cmd_statuses.c unittests/test_cmd_statuses.h \ + unittests/test_cmd_sub.c unittests/test_cmd_sub.h \ + unittests/test_cmd_disconnect.c unittests/test_cmd_disconnect.h \ + unittests/test_common.c unittests/test_common.h \ + unittests/test_contact.c unittests/test_contact.h \ + unittests/test_form.c unittests/test_form.h \ + unittests/test_jid.c unittests/test_jid.h \ + unittests/test_muc.c unittests/test_muc.h \ + unittests/test_parser.c unittests/test_parser.h \ + unittests/test_preferences.c unittests/test_preferences.h \ + unittests/test_roster_list.c unittests/test_roster_list.h \ + unittests/test_server_events.c unittests/test_server_events.h \ + unittests/test_autocomplete.c unittests/test_autocomplete.h \ + unittests/test_chat_session.c unittests/test_chat_session.h \ + unittests/unittests.c stabbertest_sources = \ stabbertests/proftest.c stabbertests/proftest.h \ @@ -109,8 +109,8 @@ otr3_sources = \ otr4_sources = \ src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c -otr_test_sources = \ - tests/otr/stub_otr.c +otr_unittest_sources = \ + unittests/otr/stub_otr.c themes_sources = themes/* @@ -119,7 +119,7 @@ script_sources = bootstrap.sh configure-debug install-all.sh man_sources = docs/profanity.1 if BUILD_OTR -test_sources += $(otr_test_sources) +unittest_sources += $(otr_unittest_sources) if BUILD_OTR3 core_sources += $(otr3_sources) endif @@ -138,10 +138,10 @@ if INCLUDE_GIT_VERSION BUILT_SOURCES = $(git_include) endif -TESTS = tests/testsuite stabbertests/stabbertestsuite -check_PROGRAMS = tests/testsuite stabbertests/stabbertestsuite -tests_testsuite_SOURCES = $(test_sources) -tests_testsuite_LDADD = -lcmocka +TESTS = unittests/unittests stabbertests/stabbertestsuite +check_PROGRAMS = unittests/unittests stabbertests/stabbertestsuite +unittests_unittests_SOURCES = $(unittest_sources) +unittests_unittests_LDADD = -lcmocka stabbertests_stabbertestsuite_SOURCES = $(stabbertest_sources) stabbertests_stabbertestsuite_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 stabbertests_stabbertestsuite_LDADD = -lcmocka -lstabber -lexpect -ltcl diff --git a/stabbertests/proftest.c b/stabbertests/proftest.c index 1f303a70..dbecd117 100644 --- a/stabbertests/proftest.c +++ b/stabbertests/proftest.c @@ -121,6 +121,19 @@ _cleanup_dirs(void) } } +void +prof_start(void) +{ + fd = exp_spawnl("./profanity", NULL); + FILE *fp = fdopen(fd, "r+"); + + if (fp == NULL) { + assert_true(FALSE); + } + + setbuf(fp, (char *)0); +} + void init_prof_test(void **state) { @@ -156,19 +169,6 @@ close_prof_test(void **state) stbbr_stop(); } -void -prof_start(void) -{ - fd = exp_spawnl("./profanity", NULL); - FILE *fp = fdopen(fd, "r+"); - - if (fp == NULL) { - assert_true(FALSE); - } - - setbuf(fp, (char *)0); -} - void prof_input(char *input) { diff --git a/tests/config/stub_accounts.c b/unittests/config/stub_accounts.c similarity index 100% rename from tests/config/stub_accounts.c rename to unittests/config/stub_accounts.c diff --git a/tests/helpers.c b/unittests/helpers.c similarity index 100% rename from tests/helpers.c rename to unittests/helpers.c diff --git a/tests/helpers.h b/unittests/helpers.h similarity index 100% rename from tests/helpers.h rename to unittests/helpers.h diff --git a/tests/log/stub_log.c b/unittests/log/stub_log.c similarity index 100% rename from tests/log/stub_log.c rename to unittests/log/stub_log.c diff --git a/tests/otr/stub_otr.c b/unittests/otr/stub_otr.c similarity index 100% rename from tests/otr/stub_otr.c rename to unittests/otr/stub_otr.c diff --git a/tests/test_autocomplete.c b/unittests/test_autocomplete.c similarity index 100% rename from tests/test_autocomplete.c rename to unittests/test_autocomplete.c diff --git a/tests/test_autocomplete.h b/unittests/test_autocomplete.h similarity index 100% rename from tests/test_autocomplete.h rename to unittests/test_autocomplete.h diff --git a/tests/test_chat_session.c b/unittests/test_chat_session.c similarity index 100% rename from tests/test_chat_session.c rename to unittests/test_chat_session.c diff --git a/tests/test_chat_session.h b/unittests/test_chat_session.h similarity index 100% rename from tests/test_chat_session.h rename to unittests/test_chat_session.h diff --git a/tests/test_cmd_account.c b/unittests/test_cmd_account.c similarity index 100% rename from tests/test_cmd_account.c rename to unittests/test_cmd_account.c diff --git a/tests/test_cmd_account.h b/unittests/test_cmd_account.h similarity index 100% rename from tests/test_cmd_account.h rename to unittests/test_cmd_account.h diff --git a/tests/test_cmd_alias.c b/unittests/test_cmd_alias.c similarity index 100% rename from tests/test_cmd_alias.c rename to unittests/test_cmd_alias.c diff --git a/tests/test_cmd_alias.h b/unittests/test_cmd_alias.h similarity index 100% rename from tests/test_cmd_alias.h rename to unittests/test_cmd_alias.h diff --git a/tests/test_cmd_bookmark.c b/unittests/test_cmd_bookmark.c similarity index 100% rename from tests/test_cmd_bookmark.c rename to unittests/test_cmd_bookmark.c diff --git a/tests/test_cmd_bookmark.h b/unittests/test_cmd_bookmark.h similarity index 100% rename from tests/test_cmd_bookmark.h rename to unittests/test_cmd_bookmark.h diff --git a/tests/test_cmd_connect.c b/unittests/test_cmd_connect.c similarity index 100% rename from tests/test_cmd_connect.c rename to unittests/test_cmd_connect.c diff --git a/tests/test_cmd_connect.h b/unittests/test_cmd_connect.h similarity index 100% rename from tests/test_cmd_connect.h rename to unittests/test_cmd_connect.h diff --git a/tests/test_cmd_disconnect.c b/unittests/test_cmd_disconnect.c similarity index 100% rename from tests/test_cmd_disconnect.c rename to unittests/test_cmd_disconnect.c diff --git a/tests/test_cmd_disconnect.h b/unittests/test_cmd_disconnect.h similarity index 100% rename from tests/test_cmd_disconnect.h rename to unittests/test_cmd_disconnect.h diff --git a/tests/test_cmd_join.c b/unittests/test_cmd_join.c similarity index 100% rename from tests/test_cmd_join.c rename to unittests/test_cmd_join.c diff --git a/tests/test_cmd_join.h b/unittests/test_cmd_join.h similarity index 100% rename from tests/test_cmd_join.h rename to unittests/test_cmd_join.h diff --git a/tests/test_cmd_otr.c b/unittests/test_cmd_otr.c similarity index 100% rename from tests/test_cmd_otr.c rename to unittests/test_cmd_otr.c diff --git a/tests/test_cmd_otr.h b/unittests/test_cmd_otr.h similarity index 100% rename from tests/test_cmd_otr.h rename to unittests/test_cmd_otr.h diff --git a/tests/test_cmd_rooms.c b/unittests/test_cmd_rooms.c similarity index 100% rename from tests/test_cmd_rooms.c rename to unittests/test_cmd_rooms.c diff --git a/tests/test_cmd_rooms.h b/unittests/test_cmd_rooms.h similarity index 100% rename from tests/test_cmd_rooms.h rename to unittests/test_cmd_rooms.h diff --git a/tests/test_cmd_roster.c b/unittests/test_cmd_roster.c similarity index 100% rename from tests/test_cmd_roster.c rename to unittests/test_cmd_roster.c diff --git a/tests/test_cmd_roster.h b/unittests/test_cmd_roster.h similarity index 100% rename from tests/test_cmd_roster.h rename to unittests/test_cmd_roster.h diff --git a/tests/test_cmd_statuses.c b/unittests/test_cmd_statuses.c similarity index 100% rename from tests/test_cmd_statuses.c rename to unittests/test_cmd_statuses.c diff --git a/tests/test_cmd_statuses.h b/unittests/test_cmd_statuses.h similarity index 100% rename from tests/test_cmd_statuses.h rename to unittests/test_cmd_statuses.h diff --git a/tests/test_cmd_sub.c b/unittests/test_cmd_sub.c similarity index 100% rename from tests/test_cmd_sub.c rename to unittests/test_cmd_sub.c diff --git a/tests/test_cmd_sub.h b/unittests/test_cmd_sub.h similarity index 100% rename from tests/test_cmd_sub.h rename to unittests/test_cmd_sub.h diff --git a/tests/test_common.c b/unittests/test_common.c similarity index 100% rename from tests/test_common.c rename to unittests/test_common.c diff --git a/tests/test_common.h b/unittests/test_common.h similarity index 100% rename from tests/test_common.h rename to unittests/test_common.h diff --git a/tests/test_contact.c b/unittests/test_contact.c similarity index 100% rename from tests/test_contact.c rename to unittests/test_contact.c diff --git a/tests/test_contact.h b/unittests/test_contact.h similarity index 100% rename from tests/test_contact.h rename to unittests/test_contact.h diff --git a/tests/test_form.c b/unittests/test_form.c similarity index 100% rename from tests/test_form.c rename to unittests/test_form.c diff --git a/tests/test_form.h b/unittests/test_form.h similarity index 100% rename from tests/test_form.h rename to unittests/test_form.h diff --git a/tests/test_jid.c b/unittests/test_jid.c similarity index 100% rename from tests/test_jid.c rename to unittests/test_jid.c diff --git a/tests/test_jid.h b/unittests/test_jid.h similarity index 100% rename from tests/test_jid.h rename to unittests/test_jid.h diff --git a/tests/test_keyhandlers.c b/unittests/test_keyhandlers.c similarity index 100% rename from tests/test_keyhandlers.c rename to unittests/test_keyhandlers.c diff --git a/tests/test_keyhandlers.h b/unittests/test_keyhandlers.h similarity index 100% rename from tests/test_keyhandlers.h rename to unittests/test_keyhandlers.h diff --git a/tests/test_muc.c b/unittests/test_muc.c similarity index 100% rename from tests/test_muc.c rename to unittests/test_muc.c diff --git a/tests/test_muc.h b/unittests/test_muc.h similarity index 100% rename from tests/test_muc.h rename to unittests/test_muc.h diff --git a/tests/test_parser.c b/unittests/test_parser.c similarity index 100% rename from tests/test_parser.c rename to unittests/test_parser.c diff --git a/tests/test_parser.h b/unittests/test_parser.h similarity index 100% rename from tests/test_parser.h rename to unittests/test_parser.h diff --git a/tests/test_preferences.c b/unittests/test_preferences.c similarity index 100% rename from tests/test_preferences.c rename to unittests/test_preferences.c diff --git a/tests/test_preferences.h b/unittests/test_preferences.h similarity index 100% rename from tests/test_preferences.h rename to unittests/test_preferences.h diff --git a/tests/test_roster_list.c b/unittests/test_roster_list.c similarity index 100% rename from tests/test_roster_list.c rename to unittests/test_roster_list.c diff --git a/tests/test_roster_list.h b/unittests/test_roster_list.h similarity index 100% rename from tests/test_roster_list.h rename to unittests/test_roster_list.h diff --git a/tests/test_server_events.c b/unittests/test_server_events.c similarity index 100% rename from tests/test_server_events.c rename to unittests/test_server_events.c diff --git a/tests/test_server_events.h b/unittests/test_server_events.h similarity index 100% rename from tests/test_server_events.h rename to unittests/test_server_events.h diff --git a/tests/ui/stub_ui.c b/unittests/ui/stub_ui.c similarity index 99% rename from tests/ui/stub_ui.c rename to unittests/ui/stub_ui.c index 52c38570..bdee3453 100644 --- a/tests/ui/stub_ui.c +++ b/unittests/ui/stub_ui.c @@ -7,7 +7,7 @@ #include "ui/window.h" #include "ui/ui.h" -#include "tests/ui/stub_ui.h" +#include "unittests/ui/stub_ui.h" // mock state diff --git a/tests/ui/stub_ui.h b/unittests/ui/stub_ui.h similarity index 100% rename from tests/ui/stub_ui.h rename to unittests/ui/stub_ui.h diff --git a/tests/testsuite.c b/unittests/unittests.c similarity index 100% rename from tests/testsuite.c rename to unittests/unittests.c diff --git a/tests/xmpp/stub_xmpp.c b/unittests/xmpp/stub_xmpp.c similarity index 100% rename from tests/xmpp/stub_xmpp.c rename to unittests/xmpp/stub_xmpp.c