simplified test structure

meson.build

@@ -100,16 +100,16 @@ test_certs_dep = declare_dependency(
 	sources: [test_server_certs, test_client_certs])
 
 alltests = executable('alltests',
-	'test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc',
-	'test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc',
-	'test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc',
-	'test/webfuse_provider/tests/core/jsonrpc/test_request.cc',
-	'test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc',
-	'test/webfuse_provider/tests/core/jsonrpc/test_response.cc',
-	'test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc',
-	'test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc',
-	'test/webfuse_provider/tests/core/timer/test_timepoint.cc',
-	'test/webfuse_provider/tests/core/timer/test_timer.cc',
+	'test/webfuse_provider/jsonrpc/mock_timer_callback.cc',
+	'test/webfuse_provider/jsonrpc/mock_timer.cc',
+	'test/webfuse_provider/jsonrpc/test_is_request.cc',
+	'test/webfuse_provider/jsonrpc/test_request.cc',
+	'test/webfuse_provider/jsonrpc/test_is_response.cc',
+	'test/webfuse_provider/jsonrpc/test_response.cc',
+	'test/webfuse_provider/jsonrpc/test_proxy.cc',
+	'test/webfuse_provider/jsonrpc/test_response_parser.cc',
+	'test/webfuse_provider/timer/test_timepoint.cc',
+	'test/webfuse_provider/timer/test_timer.cc',
 	'test/webfuse_provider/utils/timeout_watcher.cc',
 	'test/webfuse_provider/utils/ws_server.cc',
 	'test/webfuse_provider/utils/jansson_test_environment.cc',
@@ -118,22 +118,22 @@ alltests = executable('alltests',
 	'test/webfuse_provider/mocks/mock_provider_client.cc',
 	'test/webfuse_provider/mocks/mock_provider.cc',
 	'test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc',
-	'test/webfuse_provider//tests/core/test_util.cc',
-	'test/webfuse_provider/tests/core/test_container_of.cc',
-	'test/webfuse_provider/tests/core/test_slist.cc',
-	'test/webfuse_provider/tests/core/test_base64.cc',
-	'test/webfuse_provider/tests/core/test_status.cc',
-	'test/webfuse_provider/tests/core/test_message.cc',
-	'test/webfuse_provider/tests/core/test_message_queue.cc',
-	'test/webfuse_provider/tests/core/test_url.cc',
-	'test/webfuse_provider/tests/provider/test_client_protocol.cc',
-	'test/webfuse_provider/tests/provider/test_dirbuffer.cc',
-	'test/webfuse_provider/tests/provider/operation/test_close.cc',
-	'test/webfuse_provider/tests/provider/operation/test_getattr.cc',
-	'test/webfuse_provider/tests/provider/operation/test_lookup.cc',
-	'test/webfuse_provider/tests/provider/operation/test_open.cc',
-	'test/webfuse_provider/tests/provider/operation/test_read.cc',
-	'test/webfuse_provider/tests/provider/operation/test_readdir.cc',
+	'test/webfuse_provider/core/test_util.cc',
+	'test/webfuse_provider/core/test_container_of.cc',
+	'test/webfuse_provider/core/test_slist.cc',
+	'test/webfuse_provider/core/test_base64.cc',
+	'test/webfuse_provider/core/test_status.cc',
+	'test/webfuse_provider/core/test_message.cc',
+	'test/webfuse_provider/core/test_message_queue.cc',
+	'test/webfuse_provider/core/test_url.cc',
+	'test/webfuse_provider/provider/test_client_protocol.cc',
+	'test/webfuse_provider/provider/test_dirbuffer.cc',
+	'test/webfuse_provider/provider/operation/test_close.cc',
+	'test/webfuse_provider/provider/operation/test_getattr.cc',
+	'test/webfuse_provider/provider/operation/test_lookup.cc',
+	'test/webfuse_provider/provider/operation/test_open.cc',
+	'test/webfuse_provider/provider/operation/test_read.cc',
+	'test/webfuse_provider/provider/operation/test_readdir.cc',
 	link_args: [
 		'-Wl,--wrap=wfp_timer_manager_create',
 		'-Wl,--wrap=wfp_timer_manager_dispose',

test/webfuse_provider/jsonrpc/mock_timer.cc

@@ -1,4 +1,4 @@
-#include "webfuse_provider/tests/core/jsonrpc/mock_timer.hpp"
+#include "webfuse_provider/jsonrpc/mock_timer.hpp"
 #include "webfuse_provider/utils/wrap.hpp"
 
 extern "C"

test/webfuse_provider/jsonrpc/mock_timer_callback.cc

@@ -1,4 +1,4 @@
-#include "webfuse_provider/tests/core/jsonrpc/mock_timer_callback.hpp"
+#include "webfuse_provider/jsonrpc/mock_timer_callback.hpp"
 
 extern "C"
 {

test/webfuse_provider/jsonrpc/test_proxy.cc

@@ -3,7 +3,7 @@
 #include "webfuse_provider/status.h"
 #include "webfuse_provider/impl/timer/manager.h"
 
-#include "webfuse_provider/tests/core/jsonrpc/mock_timer.hpp"
+#include "webfuse_provider/jsonrpc/mock_timer.hpp"
 
 #include <thread>
 #include <chrono>