From 528a8ef5019c9b26ea4adc304da137c2888b8ff2 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 21 Jun 2020 21:02:34 +0200 Subject: [PATCH] simplified test structure --- meson.build | 52 +++++++++---------- .../{tests => }/core/test_base64.cc | 0 .../{tests => }/core/test_container_of.cc | 0 .../{tests => }/core/test_message.cc | 0 .../{tests => }/core/test_message_queue.cc | 0 .../{tests => }/core/test_slist.cc | 0 .../{tests => }/core/test_status.cc | 0 .../{tests => }/core/test_url.cc | 0 .../{tests => }/core/test_util.cc | 0 .../{tests/core => }/jsonrpc/mock_timer.cc | 2 +- .../{tests/core => }/jsonrpc/mock_timer.hpp | 0 .../core => }/jsonrpc/mock_timer_callback.cc | 2 +- .../core => }/jsonrpc/mock_timer_callback.hpp | 0 .../core => }/jsonrpc/test_is_request.cc | 0 .../core => }/jsonrpc/test_is_response.cc | 0 .../{tests/core => }/jsonrpc/test_proxy.cc | 2 +- .../{tests/core => }/jsonrpc/test_request.cc | 0 .../{tests/core => }/jsonrpc/test_response.cc | 0 .../core => }/jsonrpc/test_response_parser.cc | 0 .../provider/operation/test_close.cc | 0 .../provider/operation/test_getattr.cc | 0 .../provider/operation/test_lookup.cc | 0 .../provider/operation/test_open.cc | 0 .../provider/operation/test_read.cc | 0 .../provider/operation/test_readdir.cc | 0 .../provider/test_client_protocol.cc | 0 .../{tests => }/provider/test_dirbuffer.cc | 0 .../{tests/core => }/timer/test_timepoint.cc | 0 .../{tests/core => }/timer/test_timer.cc | 0 29 files changed, 29 insertions(+), 29 deletions(-) rename test/webfuse_provider/{tests => }/core/test_base64.cc (100%) rename test/webfuse_provider/{tests => }/core/test_container_of.cc (100%) rename test/webfuse_provider/{tests => }/core/test_message.cc (100%) rename test/webfuse_provider/{tests => }/core/test_message_queue.cc (100%) rename test/webfuse_provider/{tests => }/core/test_slist.cc (100%) rename test/webfuse_provider/{tests => }/core/test_status.cc (100%) rename test/webfuse_provider/{tests => }/core/test_url.cc (100%) rename test/webfuse_provider/{tests => }/core/test_util.cc (100%) rename test/webfuse_provider/{tests/core => }/jsonrpc/mock_timer.cc (93%) rename test/webfuse_provider/{tests/core => }/jsonrpc/mock_timer.hpp (100%) rename test/webfuse_provider/{tests/core => }/jsonrpc/mock_timer_callback.cc (89%) rename test/webfuse_provider/{tests/core => }/jsonrpc/mock_timer_callback.hpp (100%) rename test/webfuse_provider/{tests/core => }/jsonrpc/test_is_request.cc (100%) rename test/webfuse_provider/{tests/core => }/jsonrpc/test_is_response.cc (100%) rename test/webfuse_provider/{tests/core => }/jsonrpc/test_proxy.cc (99%) rename test/webfuse_provider/{tests/core => }/jsonrpc/test_request.cc (100%) rename test/webfuse_provider/{tests/core => }/jsonrpc/test_response.cc (100%) rename test/webfuse_provider/{tests/core => }/jsonrpc/test_response_parser.cc (100%) rename test/webfuse_provider/{tests => }/provider/operation/test_close.cc (100%) rename test/webfuse_provider/{tests => }/provider/operation/test_getattr.cc (100%) rename test/webfuse_provider/{tests => }/provider/operation/test_lookup.cc (100%) rename test/webfuse_provider/{tests => }/provider/operation/test_open.cc (100%) rename test/webfuse_provider/{tests => }/provider/operation/test_read.cc (100%) rename test/webfuse_provider/{tests => }/provider/operation/test_readdir.cc (100%) rename test/webfuse_provider/{tests => }/provider/test_client_protocol.cc (100%) rename test/webfuse_provider/{tests => }/provider/test_dirbuffer.cc (100%) rename test/webfuse_provider/{tests/core => }/timer/test_timepoint.cc (100%) rename test/webfuse_provider/{tests/core => }/timer/test_timer.cc (100%) diff --git a/meson.build b/meson.build index 6ea5b30..2b61bba 100644 --- a/meson.build +++ b/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', diff --git a/test/webfuse_provider/tests/core/test_base64.cc b/test/webfuse_provider/core/test_base64.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_base64.cc rename to test/webfuse_provider/core/test_base64.cc diff --git a/test/webfuse_provider/tests/core/test_container_of.cc b/test/webfuse_provider/core/test_container_of.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_container_of.cc rename to test/webfuse_provider/core/test_container_of.cc diff --git a/test/webfuse_provider/tests/core/test_message.cc b/test/webfuse_provider/core/test_message.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_message.cc rename to test/webfuse_provider/core/test_message.cc diff --git a/test/webfuse_provider/tests/core/test_message_queue.cc b/test/webfuse_provider/core/test_message_queue.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_message_queue.cc rename to test/webfuse_provider/core/test_message_queue.cc diff --git a/test/webfuse_provider/tests/core/test_slist.cc b/test/webfuse_provider/core/test_slist.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_slist.cc rename to test/webfuse_provider/core/test_slist.cc diff --git a/test/webfuse_provider/tests/core/test_status.cc b/test/webfuse_provider/core/test_status.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_status.cc rename to test/webfuse_provider/core/test_status.cc diff --git a/test/webfuse_provider/tests/core/test_url.cc b/test/webfuse_provider/core/test_url.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_url.cc rename to test/webfuse_provider/core/test_url.cc diff --git a/test/webfuse_provider/tests/core/test_util.cc b/test/webfuse_provider/core/test_util.cc similarity index 100% rename from test/webfuse_provider/tests/core/test_util.cc rename to test/webfuse_provider/core/test_util.cc diff --git a/test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc b/test/webfuse_provider/jsonrpc/mock_timer.cc similarity index 93% rename from test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc rename to test/webfuse_provider/jsonrpc/mock_timer.cc index 45733f8..9360d38 100644 --- a/test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc +++ b/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" diff --git a/test/webfuse_provider/tests/core/jsonrpc/mock_timer.hpp b/test/webfuse_provider/jsonrpc/mock_timer.hpp similarity index 100% rename from test/webfuse_provider/tests/core/jsonrpc/mock_timer.hpp rename to test/webfuse_provider/jsonrpc/mock_timer.hpp diff --git a/test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc b/test/webfuse_provider/jsonrpc/mock_timer_callback.cc similarity index 89% rename from test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc rename to test/webfuse_provider/jsonrpc/mock_timer_callback.cc index 96cf965..cf9ab78 100644 --- a/test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc +++ b/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" { diff --git a/test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.hpp b/test/webfuse_provider/jsonrpc/mock_timer_callback.hpp similarity index 100% rename from test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.hpp rename to test/webfuse_provider/jsonrpc/mock_timer_callback.hpp diff --git a/test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc b/test/webfuse_provider/jsonrpc/test_is_request.cc similarity index 100% rename from test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc rename to test/webfuse_provider/jsonrpc/test_is_request.cc diff --git a/test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc b/test/webfuse_provider/jsonrpc/test_is_response.cc similarity index 100% rename from test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc rename to test/webfuse_provider/jsonrpc/test_is_response.cc diff --git a/test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc b/test/webfuse_provider/jsonrpc/test_proxy.cc similarity index 99% rename from test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc rename to test/webfuse_provider/jsonrpc/test_proxy.cc index 5bfeb32..3ecbb8e 100644 --- a/test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc +++ b/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 #include diff --git a/test/webfuse_provider/tests/core/jsonrpc/test_request.cc b/test/webfuse_provider/jsonrpc/test_request.cc similarity index 100% rename from test/webfuse_provider/tests/core/jsonrpc/test_request.cc rename to test/webfuse_provider/jsonrpc/test_request.cc diff --git a/test/webfuse_provider/tests/core/jsonrpc/test_response.cc b/test/webfuse_provider/jsonrpc/test_response.cc similarity index 100% rename from test/webfuse_provider/tests/core/jsonrpc/test_response.cc rename to test/webfuse_provider/jsonrpc/test_response.cc diff --git a/test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc b/test/webfuse_provider/jsonrpc/test_response_parser.cc similarity index 100% rename from test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc rename to test/webfuse_provider/jsonrpc/test_response_parser.cc diff --git a/test/webfuse_provider/tests/provider/operation/test_close.cc b/test/webfuse_provider/provider/operation/test_close.cc similarity index 100% rename from test/webfuse_provider/tests/provider/operation/test_close.cc rename to test/webfuse_provider/provider/operation/test_close.cc diff --git a/test/webfuse_provider/tests/provider/operation/test_getattr.cc b/test/webfuse_provider/provider/operation/test_getattr.cc similarity index 100% rename from test/webfuse_provider/tests/provider/operation/test_getattr.cc rename to test/webfuse_provider/provider/operation/test_getattr.cc diff --git a/test/webfuse_provider/tests/provider/operation/test_lookup.cc b/test/webfuse_provider/provider/operation/test_lookup.cc similarity index 100% rename from test/webfuse_provider/tests/provider/operation/test_lookup.cc rename to test/webfuse_provider/provider/operation/test_lookup.cc diff --git a/test/webfuse_provider/tests/provider/operation/test_open.cc b/test/webfuse_provider/provider/operation/test_open.cc similarity index 100% rename from test/webfuse_provider/tests/provider/operation/test_open.cc rename to test/webfuse_provider/provider/operation/test_open.cc diff --git a/test/webfuse_provider/tests/provider/operation/test_read.cc b/test/webfuse_provider/provider/operation/test_read.cc similarity index 100% rename from test/webfuse_provider/tests/provider/operation/test_read.cc rename to test/webfuse_provider/provider/operation/test_read.cc diff --git a/test/webfuse_provider/tests/provider/operation/test_readdir.cc b/test/webfuse_provider/provider/operation/test_readdir.cc similarity index 100% rename from test/webfuse_provider/tests/provider/operation/test_readdir.cc rename to test/webfuse_provider/provider/operation/test_readdir.cc diff --git a/test/webfuse_provider/tests/provider/test_client_protocol.cc b/test/webfuse_provider/provider/test_client_protocol.cc similarity index 100% rename from test/webfuse_provider/tests/provider/test_client_protocol.cc rename to test/webfuse_provider/provider/test_client_protocol.cc diff --git a/test/webfuse_provider/tests/provider/test_dirbuffer.cc b/test/webfuse_provider/provider/test_dirbuffer.cc similarity index 100% rename from test/webfuse_provider/tests/provider/test_dirbuffer.cc rename to test/webfuse_provider/provider/test_dirbuffer.cc diff --git a/test/webfuse_provider/tests/core/timer/test_timepoint.cc b/test/webfuse_provider/timer/test_timepoint.cc similarity index 100% rename from test/webfuse_provider/tests/core/timer/test_timepoint.cc rename to test/webfuse_provider/timer/test_timepoint.cc diff --git a/test/webfuse_provider/tests/core/timer/test_timer.cc b/test/webfuse_provider/timer/test_timer.cc similarity index 100% rename from test/webfuse_provider/tests/core/timer/test_timer.cc rename to test/webfuse_provider/timer/test_timer.cc