Moved all tests to tests folder

72 files changed, 51 insertions, 51 deletions

diff --git a/.gitignore b/.gitignore
index cf6e3eba..c62b5575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,12 +39,12 @@ profanity
 **/*.o
 
 # test output
-functionaltests/functionaltests
-functionaltests/functionaltests.log
-functionaltests/functionaltests.trs
-unittests/unittests
-unittests/unittests.log
-unittests/unittests.trs
+tests/functionaltests/functionaltests
+tests/functionaltests/functionaltests.log
+tests/functionaltests/functionaltests.trs
+tests/unittests/unittests
+tests/unittests/unittests.log
+tests/unittests/unittests.trs
 test-suite.log
 
 # local scripts
diff --git a/Makefile.am b/Makefile.am
index c566b675..ef1477f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,44 +65,44 @@ unittest_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 \
-	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
+	tests/unittests/xmpp/stub_xmpp.c \
+	tests/unittests/ui/stub_ui.c \
+	tests/unittests/log/stub_log.c \
+	tests/unittests/config/stub_accounts.c \
+	tests/unittests/helpers.c tests/unittests/helpers.h \
+	tests/unittests/test_cmd_account.c tests/unittests/test_cmd_account.h \
+	tests/unittests/test_cmd_alias.c tests/unittests/test_cmd_alias.h \
+	tests/unittests/test_cmd_bookmark.c tests/unittests/test_cmd_bookmark.h \
+	tests/unittests/test_cmd_connect.c tests/unittests/test_cmd_connect.h \
+	tests/unittests/test_cmd_join.c tests/unittests/test_cmd_join.h \
+	tests/unittests/test_cmd_otr.c tests/unittests/test_cmd_otr.h \
+	tests/unittests/test_cmd_rooms.c tests/unittests/test_cmd_rooms.h \
+	tests/unittests/test_cmd_roster.c tests/unittests/test_cmd_roster.h \
+	tests/unittests/test_cmd_statuses.c tests/unittests/test_cmd_statuses.h \
+	tests/unittests/test_cmd_sub.c tests/unittests/test_cmd_sub.h \
+	tests/unittests/test_cmd_disconnect.c tests/unittests/test_cmd_disconnect.h \
+	tests/unittests/test_common.c tests/unittests/test_common.h \
+	tests/unittests/test_contact.c tests/unittests/test_contact.h \
+	tests/unittests/test_form.c tests/unittests/test_form.h \
+	tests/unittests/test_jid.c tests/unittests/test_jid.h \
+	tests/unittests/test_muc.c tests/unittests/test_muc.h \
+	tests/unittests/test_parser.c tests/unittests/test_parser.h \
+	tests/unittests/test_preferences.c tests/unittests/test_preferences.h \
+	tests/unittests/test_roster_list.c tests/unittests/test_roster_list.h \
+	tests/unittests/test_server_events.c tests/unittests/test_server_events.h \
+	tests/unittests/test_autocomplete.c tests/unittests/test_autocomplete.h \
+	tests/unittests/test_chat_session.c tests/unittests/test_chat_session.h \
+	tests/unittests/unittests.c
 
 functionaltest_sources = \
-	functionaltests/proftest.c functionaltests/proftest.h \
-	functionaltests/test_connect.c functionaltests/test_connect.h \
-	functionaltests/test_ping.c functionaltests/test_ping.h \
-	functionaltests/test_rooms.c functionaltests/test_rooms.h \
-	functionaltests/test_presence.c functionaltests/test_presence.h \
-	functionaltests/test_message.c functionaltests/test_message.h \
-	functionaltests/test_chat_session.c functionaltests/test_chat_session.h \
-	functionaltests/functionaltests.c
+	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 \
+	tests/functionaltests/test_rooms.c tests/functionaltests/test_rooms.h \
+	tests/functionaltests/test_presence.c tests/functionaltests/test_presence.h \
+	tests/functionaltests/test_message.c tests/functionaltests/test_message.h \
+	tests/functionaltests/test_chat_session.c tests/functionaltests/test_chat_session.h \
+	tests/functionaltests/functionaltests.c
 
 main_source = src/main.c
 
@@ -115,7 +115,7 @@ otr4_sources = \
 	src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c
 
 otr_unittest_sources = \
-	unittests/otr/stub_otr.c
+	tests/unittests/otr/stub_otr.c
 
 themes_sources = themes/*
 
@@ -143,13 +143,13 @@ if INCLUDE_GIT_VERSION
 BUILT_SOURCES = $(git_include)
 endif
 
-TESTS = unittests/unittests functionaltests/functionaltests
-check_PROGRAMS = unittests/unittests functionaltests/functionaltests
-unittests_unittests_SOURCES = $(unittest_sources)
-unittests_unittests_LDADD = -lcmocka
-functionaltests_functionaltests_SOURCES = $(functionaltest_sources)
-functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5
-functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl
+TESTS = tests/unittests/unittests tests/functionaltests/functionaltests
+check_PROGRAMS = tests/unittests/unittests tests/functionaltests/functionaltests
+tests_unittests_unittests_SOURCES = $(unittest_sources)
+tests_unittests_unittests_LDADD = -lcmocka
+tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources)
+tests_functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5
+tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl
 
 man_MANS = $(man_sources)
 
diff --git a/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c
index a1550842..a1550842 100644
--- a/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
diff --git a/functionaltests/proftest.c b/tests/functionaltests/proftest.c
index 5d7b6585..5d7b6585 100644
--- a/functionaltests/proftest.c
+++ b/tests/functionaltests/proftest.c
diff --git a/functionaltests/proftest.h b/tests/functionaltests/proftest.h
index f57f6c35..f57f6c35 100644
--- a/functionaltests/proftest.h
+++ b/tests/functionaltests/proftest.h
diff --git a/functionaltests/test_chat_session.c b/tests/functionaltests/test_chat_session.c
index 11df4e76..11df4e76 100644
--- a/functionaltests/test_chat_session.c
+++ b/tests/functionaltests/test_chat_session.c
diff --git a/functionaltests/test_chat_session.h b/tests/functionaltests/test_chat_session.h
index 2ba75e05..2ba75e05 100644
--- a/functionaltests/test_chat_session.h
+++ b/tests/functionaltests/test_chat_session.h
diff --git a/functionaltests/test_connect.c b/tests/functionaltests/test_connect.c
index 7a42397f..7a42397f 100644
--- a/functionaltests/test_connect.c
+++ b/tests/functionaltests/test_connect.c
diff --git a/functionaltests/test_connect.h b/tests/functionaltests/test_connect.h
index c6ceb404..c6ceb404 100644
--- a/functionaltests/test_connect.h
+++ b/tests/functionaltests/test_connect.h
diff --git a/functionaltests/test_message.c b/tests/functionaltests/test_message.c
index 5cdad520..5cdad520 100644
--- a/functionaltests/test_message.c
+++ b/tests/functionaltests/test_message.c
diff --git a/functionaltests/test_message.h b/tests/functionaltests/test_message.h
index b8f03a7e..b8f03a7e 100644
--- a/functionaltests/test_message.h
+++ b/tests/functionaltests/test_message.h
diff --git a/functionaltests/test_ping.c b/tests/functionaltests/test_ping.c
index e2ca79ca..e2ca79ca 100644
--- a/functionaltests/test_ping.c
+++ b/tests/functionaltests/test_ping.c
diff --git a/functionaltests/test_ping.h b/tests/functionaltests/test_ping.h
index a222a486..a222a486 100644
--- a/functionaltests/test_ping.h
+++ b/tests/functionaltests/test_ping.h
diff --git a/functionaltests/test_presence.c b/tests/functionaltests/test_presence.c
index b26bdccb..b26bdccb 100644
--- a/functionaltests/test_presence.c
+++ b/tests/functionaltests/test_presence.c
diff --git a/functionaltests/test_presence.h b/tests/functionaltests/test_presence.h
index 0603732a..0603732a 100644
--- a/functionaltests/test_presence.h
+++ b/tests/functionaltests/test_presence.h
diff --git a/functionaltests/test_rooms.c b/tests/functionaltests/test_rooms.c
index 20ed7342..20ed7342 100644
--- a/functionaltests/test_rooms.c
+++ b/tests/functionaltests/test_rooms.c
diff --git a/functionaltests/test_rooms.h b/tests/functionaltests/test_rooms.h
index a0cf5db8..a0cf5db8 100644
--- a/functionaltests/test_rooms.h
+++ b/tests/functionaltests/test_rooms.h
diff --git a/unittests/config/stub_accounts.c b/tests/unittests/config/stub_accounts.c
index 32a80fda..32a80fda 100644
--- a/unittests/config/stub_accounts.c
+++ b/tests/unittests/config/stub_accounts.c
diff --git a/unittests/helpers.c b/tests/unittests/helpers.c
index 564b2716..564b2716 100644
--- a/unittests/helpers.c
+++ b/tests/unittests/helpers.c
diff --git a/unittests/helpers.h b/tests/unittests/helpers.h
index 75d446d0..75d446d0 100644
--- a/unittests/helpers.h
+++ b/tests/unittests/helpers.h
diff --git a/unittests/log/stub_log.c b/tests/unittests/log/stub_log.c
index f88871a7..f88871a7 100644
--- a/unittests/log/stub_log.c
+++ b/tests/unittests/log/stub_log.c
diff --git a/unittests/otr/stub_otr.c b/tests/unittests/otr/stub_otr.c
index 482f0a7f..482f0a7f 100644
--- a/unittests/otr/stub_otr.c
+++ b/tests/unittests/otr/stub_otr.c
diff --git a/unittests/test_autocomplete.c b/tests/unittests/test_autocomplete.c
index f6ef8653..f6ef8653 100644
--- a/unittests/test_autocomplete.c
+++ b/tests/unittests/test_autocomplete.c
diff --git a/unittests/test_autocomplete.h b/tests/unittests/test_autocomplete.h
index 4ad327c0..4ad327c0 100644
--- a/unittests/test_autocomplete.h
+++ b/tests/unittests/test_autocomplete.h
diff --git a/unittests/test_chat_session.c b/tests/unittests/test_chat_session.c
index b5e1f7b6..b5e1f7b6 100644
--- a/unittests/test_chat_session.c
+++ b/tests/unittests/test_chat_session.c
diff --git a/unittests/test_chat_session.h b/tests/unittests/test_chat_session.h
index 4ce03fd5..4ce03fd5 100644
--- a/unittests/test_chat_session.h
+++ b/tests/unittests/test_chat_session.h
diff --git a/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c
index bddc4c6d..bddc4c6d 100644
--- a/unittests/test_cmd_account.c
+++ b/tests/unittests/test_cmd_account.c
diff --git a/unittests/test_cmd_account.h b/tests/unittests/test_cmd_account.h
index 91bd1e70..91bd1e70 100644
--- a/unittests/test_cmd_account.h
+++ b/tests/unittests/test_cmd_account.h
diff --git a/unittests/test_cmd_alias.c b/tests/unittests/test_cmd_alias.c
index 10ab7f53..10ab7f53 100644
--- a/unittests/test_cmd_alias.c
+++ b/tests/unittests/test_cmd_alias.c
diff --git a/unittests/test_cmd_alias.h b/tests/unittests/test_cmd_alias.h
index bd93ef1a..bd93ef1a 100644
--- a/unittests/test_cmd_alias.h
+++ b/tests/unittests/test_cmd_alias.h
diff --git a/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c
index 695e7362..695e7362 100644
--- a/unittests/test_cmd_bookmark.c
+++ b/tests/unittests/test_cmd_bookmark.c
diff --git a/unittests/test_cmd_bookmark.h b/tests/unittests/test_cmd_bookmark.h
index 9505e105..9505e105 100644
--- a/unittests/test_cmd_bookmark.h
+++ b/tests/unittests/test_cmd_bookmark.h
diff --git a/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c
index e2089a09..e2089a09 100644
--- a/unittests/test_cmd_connect.c
+++ b/tests/unittests/test_cmd_connect.c
diff --git a/unittests/test_cmd_connect.h b/tests/unittests/test_cmd_connect.h
index ad27a0a5..ad27a0a5 100644
--- a/unittests/test_cmd_connect.h
+++ b/tests/unittests/test_cmd_connect.h
diff --git a/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c
index 68253820..68253820 100644
--- a/unittests/test_cmd_disconnect.c
+++ b/tests/unittests/test_cmd_disconnect.c
diff --git a/unittests/test_cmd_disconnect.h b/tests/unittests/test_cmd_disconnect.h
index 856b501e..856b501e 100644
--- a/unittests/test_cmd_disconnect.h
+++ b/tests/unittests/test_cmd_disconnect.h
diff --git a/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c
index 19824b3a..19824b3a 100644
--- a/unittests/test_cmd_join.c
+++ b/tests/unittests/test_cmd_join.c
diff --git a/unittests/test_cmd_join.h b/tests/unittests/test_cmd_join.h
index a96fa435..a96fa435 100644
--- a/unittests/test_cmd_join.h
+++ b/tests/unittests/test_cmd_join.h
diff --git a/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c
index dae17947..dae17947 100644
--- a/unittests/test_cmd_otr.c
+++ b/tests/unittests/test_cmd_otr.c
diff --git a/unittests/test_cmd_otr.h b/tests/unittests/test_cmd_otr.h
index 8ef182e9..8ef182e9 100644
--- a/unittests/test_cmd_otr.h
+++ b/tests/unittests/test_cmd_otr.h
diff --git a/unittests/test_cmd_rooms.c b/tests/unittests/test_cmd_rooms.c
index 5114bfbf..5114bfbf 100644
--- a/unittests/test_cmd_rooms.c
+++ b/tests/unittests/test_cmd_rooms.c
diff --git a/unittests/test_cmd_rooms.h b/tests/unittests/test_cmd_rooms.h
index a9a7af83..a9a7af83 100644
--- a/unittests/test_cmd_rooms.h
+++ b/tests/unittests/test_cmd_rooms.h
diff --git a/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c
index a7160cf5..a7160cf5 100644
--- a/unittests/test_cmd_roster.c
+++ b/tests/unittests/test_cmd_roster.c
diff --git a/unittests/test_cmd_roster.h b/tests/unittests/test_cmd_roster.h
index 79f69ec8..79f69ec8 100644
--- a/unittests/test_cmd_roster.h
+++ b/tests/unittests/test_cmd_roster.h
diff --git a/unittests/test_cmd_statuses.c b/tests/unittests/test_cmd_statuses.c
index ed37021a..ed37021a 100644
--- a/unittests/test_cmd_statuses.c
+++ b/tests/unittests/test_cmd_statuses.c
diff --git a/unittests/test_cmd_statuses.h b/tests/unittests/test_cmd_statuses.h
index 306a6fc7..306a6fc7 100644
--- a/unittests/test_cmd_statuses.h
+++ b/tests/unittests/test_cmd_statuses.h
diff --git a/unittests/test_cmd_sub.c b/tests/unittests/test_cmd_sub.c
index 80b85f15..80b85f15 100644
--- a/unittests/test_cmd_sub.c
+++ b/tests/unittests/test_cmd_sub.c
diff --git a/unittests/test_cmd_sub.h b/tests/unittests/test_cmd_sub.h
index 6e8addd3..6e8addd3 100644
--- a/unittests/test_cmd_sub.h
+++ b/tests/unittests/test_cmd_sub.h
diff --git a/unittests/test_common.c b/tests/unittests/test_common.c
index 980f2198..980f2198 100644
--- a/unittests/test_common.c
+++ b/tests/unittests/test_common.c
diff --git a/unittests/test_common.h b/tests/unittests/test_common.h
index b4b98e5a..b4b98e5a 100644
--- a/unittests/test_common.h
+++ b/tests/unittests/test_common.h
diff --git a/unittests/test_contact.c b/tests/unittests/test_contact.c
index cad88907..cad88907 100644
--- a/unittests/test_contact.c
+++ b/tests/unittests/test_contact.c
diff --git a/unittests/test_contact.h b/tests/unittests/test_contact.h
index c9d8c1fd..c9d8c1fd 100644
--- a/unittests/test_contact.h
+++ b/tests/unittests/test_contact.h
diff --git a/unittests/test_form.c b/tests/unittests/test_form.c
index b3158a83..b3158a83 100644
--- a/unittests/test_form.c
+++ b/tests/unittests/test_form.c
diff --git a/unittests/test_form.h b/tests/unittests/test_form.h
index 65911d0a..65911d0a 100644
--- a/unittests/test_form.h
+++ b/tests/unittests/test_form.h
diff --git a/unittests/test_jid.c b/tests/unittests/test_jid.c
index ff5f4c9a..ff5f4c9a 100644
--- a/unittests/test_jid.c
+++ b/tests/unittests/test_jid.c
diff --git a/unittests/test_jid.h b/tests/unittests/test_jid.h
index 9b96d0b8..9b96d0b8 100644
--- a/unittests/test_jid.h
+++ b/tests/unittests/test_jid.h
diff --git a/unittests/test_keyhandlers.c b/tests/unittests/test_keyhandlers.c
index a6d39143..a6d39143 100644
--- a/unittests/test_keyhandlers.c
+++ b/tests/unittests/test_keyhandlers.c
diff --git a/unittests/test_keyhandlers.h b/tests/unittests/test_keyhandlers.h
index 4be429a9..4be429a9 100644
--- a/unittests/test_keyhandlers.h
+++ b/tests/unittests/test_keyhandlers.h
diff --git a/unittests/test_muc.c b/tests/unittests/test_muc.c
index e3b7f9b0..e3b7f9b0 100644
--- a/unittests/test_muc.c
+++ b/tests/unittests/test_muc.c
diff --git a/unittests/test_muc.h b/tests/unittests/test_muc.h
index 8df54a5d..8df54a5d 100644
--- a/unittests/test_muc.h
+++ b/tests/unittests/test_muc.h
diff --git a/unittests/test_parser.c b/tests/unittests/test_parser.c
index faefc9c7..faefc9c7 100644
--- a/unittests/test_parser.c
+++ b/tests/unittests/test_parser.c
diff --git a/unittests/test_parser.h b/tests/unittests/test_parser.h
index 51d768fe..51d768fe 100644
--- a/unittests/test_parser.h
+++ b/tests/unittests/test_parser.h
diff --git a/unittests/test_preferences.c b/tests/unittests/test_preferences.c
index c4bcbf77..c4bcbf77 100644
--- a/unittests/test_preferences.c
+++ b/tests/unittests/test_preferences.c
diff --git a/unittests/test_preferences.h b/tests/unittests/test_preferences.h
index 5bf79a6a..5bf79a6a 100644
--- a/unittests/test_preferences.h
+++ b/tests/unittests/test_preferences.h
diff --git a/unittests/test_roster_list.c b/tests/unittests/test_roster_list.c
index 41ccb8cf..41ccb8cf 100644
--- a/unittests/test_roster_list.c
+++ b/tests/unittests/test_roster_list.c
diff --git a/unittests/test_roster_list.h b/tests/unittests/test_roster_list.h
index 080bca9f..080bca9f 100644
--- a/unittests/test_roster_list.h
+++ b/tests/unittests/test_roster_list.h
diff --git a/unittests/test_server_events.c b/tests/unittests/test_server_events.c
index 58489807..58489807 100644
--- a/unittests/test_server_events.c
+++ b/tests/unittests/test_server_events.c
diff --git a/unittests/test_server_events.h b/tests/unittests/test_server_events.h
index 81a436f4..81a436f4 100644
--- a/unittests/test_server_events.h
+++ b/tests/unittests/test_server_events.h
diff --git a/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 0052bfc8..1289aa4b 100644
--- a/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -7,7 +7,7 @@
 #include "ui/window.h"
 #include "ui/ui.h"
 
-#include "unittests/ui/stub_ui.h"
+#include "tests/unittests/ui/stub_ui.h"
 
 // mock state
 
diff --git a/unittests/ui/stub_ui.h b/tests/unittests/ui/stub_ui.h
index 81357a86..81357a86 100644
--- a/unittests/ui/stub_ui.h
+++ b/tests/unittests/ui/stub_ui.h
diff --git a/unittests/unittests.c b/tests/unittests/unittests.c
index 3f860178..3f860178 100644
--- a/unittests/unittests.c
+++ b/tests/unittests/unittests.c
diff --git a/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c
index d3be1af6..d3be1af6 100644
--- a/unittests/xmpp/stub_xmpp.c
+++ b/tests/unittests/xmpp/stub_xmpp.c