From 73f15b37905b19f3872abb1acfef4a2984787fb1 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 21 Jun 2020 21:18:43 +0200 Subject: [PATCH] refactor: changed directory structure --- lib/webfuse_provider/api.c | 2 +- lib/webfuse_provider/impl/client.c | 2 +- lib/webfuse_provider/impl/client_protocol.c | 6 +-- lib/webfuse_provider/impl/client_protocol.h | 2 +- lib/webfuse_provider/impl/message.h | 2 +- lib/webfuse_provider/impl/message_queue.c | 2 +- lib/webfuse_provider/impl/operation/close.c | 2 +- lib/webfuse_provider/impl/operation/getattr.c | 2 +- lib/webfuse_provider/impl/operation/lookup.c | 2 +- lib/webfuse_provider/impl/operation/open.c | 2 +- lib/webfuse_provider/impl/operation/read.c | 4 +- lib/webfuse_provider/impl/operation/readdir.c | 2 +- lib/webfuse_provider/impl/{ => util}/base64.c | 2 +- lib/webfuse_provider/impl/{ => util}/base64.h | 4 +- .../impl/{ => util}/container_of.h | 4 +- .../impl/{ => util}/json_util.c | 2 +- .../impl/{ => util}/json_util.h | 0 .../impl/{ => util}/lws_log.c | 2 +- .../impl/{ => util}/lws_log.h | 0 lib/webfuse_provider/impl/{ => util}/slist.c | 2 +- lib/webfuse_provider/impl/{ => util}/slist.h | 4 +- lib/webfuse_provider/impl/{ => util}/url.c | 2 +- lib/webfuse_provider/impl/{ => util}/url.h | 4 +- lib/webfuse_provider/impl/{ => util}/util.h | 0 meson.build | 42 +++++++++---------- test/webfuse_provider/jsonrpc/mock_timer.cc | 2 +- .../mocks/mock_jsonrpc_proxy.cc | 2 +- .../mocks/mock_operation_context.cc | 2 +- .../provider/test_client_protocol.cc | 4 +- .../jansson_test_environment.cc | 0 .../{utils => test_util}/timeout_watcher.cc | 2 +- .../{utils => test_util}/timeout_watcher.hpp | 0 .../{utils => test_util}/wrap.hpp | 0 .../{utils => test_util}/ws_server.cc | 4 +- .../{utils => test_util}/ws_server.h | 0 .../{core => util}/test_base64.cc | 2 +- .../{core => util}/test_container_of.cc | 2 +- .../{core => util}/test_message.cc | 0 .../{core => util}/test_message_queue.cc | 2 +- .../{core => util}/test_slist.cc | 2 +- .../{core => util}/test_status.cc | 0 .../{core => util}/test_url.cc | 2 +- .../{core => util}/test_util.cc | 2 +- 43 files changed, 63 insertions(+), 63 deletions(-) rename lib/webfuse_provider/impl/{ => util}/base64.c (99%) rename lib/webfuse_provider/impl/{ => util}/base64.h (93%) rename lib/webfuse_provider/impl/{ => util}/container_of.h (86%) rename lib/webfuse_provider/impl/{ => util}/json_util.c (90%) rename lib/webfuse_provider/impl/{ => util}/json_util.h (100%) rename lib/webfuse_provider/impl/{ => util}/lws_log.c (86%) rename lib/webfuse_provider/impl/{ => util}/lws_log.h (100%) rename lib/webfuse_provider/impl/{ => util}/slist.c (95%) rename lib/webfuse_provider/impl/{ => util}/slist.h (93%) rename lib/webfuse_provider/impl/{ => util}/url.c (98%) rename lib/webfuse_provider/impl/{ => util}/url.h (88%) rename lib/webfuse_provider/impl/{ => util}/util.h (100%) rename test/webfuse_provider/{utils => test_util}/jansson_test_environment.cc (100%) rename test/webfuse_provider/{utils => test_util}/timeout_watcher.cc (93%) rename test/webfuse_provider/{utils => test_util}/timeout_watcher.hpp (100%) rename test/webfuse_provider/{utils => test_util}/wrap.hpp (100%) rename test/webfuse_provider/{utils => test_util}/ws_server.cc (98%) rename test/webfuse_provider/{utils => test_util}/ws_server.h (100%) rename test/webfuse_provider/{core => util}/test_base64.cc (98%) rename test/webfuse_provider/{core => util}/test_container_of.cc (89%) rename test/webfuse_provider/{core => util}/test_message.cc (100%) rename test/webfuse_provider/{core => util}/test_message_queue.cc (96%) rename test/webfuse_provider/{core => util}/test_slist.cc (98%) rename test/webfuse_provider/{core => util}/test_status.cc (100%) rename test/webfuse_provider/{core => util}/test_url.cc (97%) rename test/webfuse_provider/{core => util}/test_util.cc (95%) diff --git a/lib/webfuse_provider/api.c b/lib/webfuse_provider/api.c index 4c07d2c..0155dd5 100644 --- a/lib/webfuse_provider/api.c +++ b/lib/webfuse_provider/api.c @@ -13,7 +13,7 @@ #include "webfuse_provider/impl/dirbuffer.h" #include "webfuse_provider/impl/credentials.h" -#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/util/util.h" // respond diff --git a/lib/webfuse_provider/impl/client.c b/lib/webfuse_provider/impl/client.c index ca2f6e2..596cbaf 100644 --- a/lib/webfuse_provider/impl/client.c +++ b/lib/webfuse_provider/impl/client.c @@ -9,7 +9,7 @@ #include "webfuse_provider/impl/provider.h" #include "webfuse_provider/impl/client_protocol.h" #include "webfuse_provider/impl/client_config.h" -#include "webfuse_provider/impl/lws_log.h" +#include "webfuse_provider/impl/util/lws_log.h" #define WFP_CLIENT_PROTOCOL_COUNT 2 diff --git a/lib/webfuse_provider/impl/client_protocol.c b/lib/webfuse_provider/impl/client_protocol.c index 3fe2237..c32e454 100644 --- a/lib/webfuse_provider/impl/client_protocol.c +++ b/lib/webfuse_provider/impl/client_protocol.c @@ -9,11 +9,11 @@ #include "webfuse_provider/impl/client_config.h" #include "webfuse_provider/impl/provider.h" #include "webfuse_provider/impl/credentials.h" -#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/util/util.h" #include "webfuse_provider/impl/message.h" #include "webfuse_provider/impl/message_queue.h" -#include "webfuse_provider/impl/container_of.h" -#include "webfuse_provider/impl/url.h" +#include "webfuse_provider/impl/util/container_of.h" +#include "webfuse_provider/impl/util/url.h" #include "webfuse_provider/protocol_names.h" #include "webfuse_provider/impl/timer/manager.h" diff --git a/lib/webfuse_provider/impl/client_protocol.h b/lib/webfuse_provider/impl/client_protocol.h index da09e8b..60eec44 100644 --- a/lib/webfuse_provider/impl/client_protocol.h +++ b/lib/webfuse_provider/impl/client_protocol.h @@ -4,7 +4,7 @@ #include "webfuse_provider/impl/provider.h" #include "webfuse_provider/impl/request.h" -#include "webfuse_provider/impl/slist.h" +#include "webfuse_provider/impl/util/slist.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse_provider/impl/message.h b/lib/webfuse_provider/impl/message.h index 9ab5a2c..776f848 100644 --- a/lib/webfuse_provider/impl/message.h +++ b/lib/webfuse_provider/impl/message.h @@ -9,7 +9,7 @@ using std::size_t; #endif #include -#include "webfuse_provider/impl/slist.h" +#include "webfuse_provider/impl/util/slist.h" struct wfp_message { diff --git a/lib/webfuse_provider/impl/message_queue.c b/lib/webfuse_provider/impl/message_queue.c index 375163e..337bebe 100644 --- a/lib/webfuse_provider/impl/message_queue.c +++ b/lib/webfuse_provider/impl/message_queue.c @@ -1,6 +1,6 @@ #include "webfuse_provider/impl/message_queue.h" #include "webfuse_provider/impl/message.h" -#include "webfuse_provider/impl/container_of.h" +#include "webfuse_provider/impl/util/container_of.h" void wfp_message_queue_cleanup( struct wfp_slist * queue) diff --git a/lib/webfuse_provider/impl/operation/close.c b/lib/webfuse_provider/impl/operation/close.c index e75a43b..3b87a49 100644 --- a/lib/webfuse_provider/impl/operation/close.c +++ b/lib/webfuse_provider/impl/operation/close.c @@ -1,6 +1,6 @@ #include "webfuse_provider/impl/operation/close.h" #include -#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/util/util.h" void wfp_impl_close( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse_provider/impl/operation/getattr.c b/lib/webfuse_provider/impl/operation/getattr.c index 4ccc521..7c71f08 100644 --- a/lib/webfuse_provider/impl/operation/getattr.c +++ b/lib/webfuse_provider/impl/operation/getattr.c @@ -4,7 +4,7 @@ #include "webfuse_provider/impl/operation/error.h" #include "webfuse_provider/impl/request.h" -#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/util/util.h" void wfp_impl_getattr( diff --git a/lib/webfuse_provider/impl/operation/lookup.c b/lib/webfuse_provider/impl/operation/lookup.c index 92482d0..3f39c4a 100644 --- a/lib/webfuse_provider/impl/operation/lookup.c +++ b/lib/webfuse_provider/impl/operation/lookup.c @@ -4,7 +4,7 @@ #include "webfuse_provider/impl/operation/error.h" #include "webfuse_provider/impl/request.h" -#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/util/util.h" void wfp_impl_lookup( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse_provider/impl/operation/open.c b/lib/webfuse_provider/impl/operation/open.c index 3916c07..4803cfc 100644 --- a/lib/webfuse_provider/impl/operation/open.c +++ b/lib/webfuse_provider/impl/operation/open.c @@ -1,7 +1,7 @@ #include "webfuse_provider/impl/operation/open.h" #include "webfuse_provider/impl/operation/error.h" #include "webfuse_provider/impl/request.h" -#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/util/util.h" void wfp_impl_open( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse_provider/impl/operation/read.c b/lib/webfuse_provider/impl/operation/read.c index d9d8043..0383eb2 100644 --- a/lib/webfuse_provider/impl/operation/read.c +++ b/lib/webfuse_provider/impl/operation/read.c @@ -4,8 +4,8 @@ #include "webfuse_provider/impl/operation/error.h" #include "webfuse_provider/impl/request.h" -#include "webfuse_provider/impl/util.h" -#include "webfuse_provider/impl/base64.h" +#include "webfuse_provider/impl/util/util.h" +#include "webfuse_provider/impl/util/base64.h" void wfp_impl_read( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse_provider/impl/operation/readdir.c b/lib/webfuse_provider/impl/operation/readdir.c index f6e3e18..6813f2d 100644 --- a/lib/webfuse_provider/impl/operation/readdir.c +++ b/lib/webfuse_provider/impl/operation/readdir.c @@ -2,7 +2,7 @@ #include "webfuse_provider/impl/operation/error.h" #include "webfuse_provider/impl/dirbuffer.h" #include "webfuse_provider/impl/request.h" -#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/util/util.h" void wfp_impl_readdir( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse_provider/impl/base64.c b/lib/webfuse_provider/impl/util/base64.c similarity index 99% rename from lib/webfuse_provider/impl/base64.c rename to lib/webfuse_provider/impl/util/base64.c index eda4bcd..061d044 100644 --- a/lib/webfuse_provider/impl/base64.c +++ b/lib/webfuse_provider/impl/util/base64.c @@ -1,4 +1,4 @@ -#include "webfuse_provider/impl/base64.h" +#include "webfuse_provider/impl/util/base64.h" static const uint8_t wfp_impl_base64_decode_table[256] = { // 0 1 2 3 4 5 6 7 8 9 A B C D E F diff --git a/lib/webfuse_provider/impl/base64.h b/lib/webfuse_provider/impl/util/base64.h similarity index 93% rename from lib/webfuse_provider/impl/base64.h rename to lib/webfuse_provider/impl/util/base64.h index 888b4b9..257100e 100644 --- a/lib/webfuse_provider/impl/base64.h +++ b/lib/webfuse_provider/impl/util/base64.h @@ -1,5 +1,5 @@ -#ifndef WFP_BASE64_H -#define WFP_BASE64_H +#ifndef WFP_UTIL_BASE64_H +#define WFP_UTILBASE64_H #ifndef __cplusplus #include diff --git a/lib/webfuse_provider/impl/container_of.h b/lib/webfuse_provider/impl/util/container_of.h similarity index 86% rename from lib/webfuse_provider/impl/container_of.h rename to lib/webfuse_provider/impl/util/container_of.h index 1cc416f..b9517de 100644 --- a/lib/webfuse_provider/impl/container_of.h +++ b/lib/webfuse_provider/impl/util/container_of.h @@ -1,5 +1,5 @@ -#ifndef WFP_CONTAINER_OF_H -#define WFP_CONTAINER_OF_H +#ifndef WFP_UTIL_CONTAINER_OF_H +#define WFP_UTIL_CONTAINER_OF_H #ifndef __cplusplus #include diff --git a/lib/webfuse_provider/impl/json_util.c b/lib/webfuse_provider/impl/util/json_util.c similarity index 90% rename from lib/webfuse_provider/impl/json_util.c rename to lib/webfuse_provider/impl/util/json_util.c index 27de867..a4db38b 100644 --- a/lib/webfuse_provider/impl/json_util.c +++ b/lib/webfuse_provider/impl/util/json_util.c @@ -1,4 +1,4 @@ -#include "webfuse_provider/impl/json_util.h" +#include "webfuse_provider/impl/util/json_util.h" int wfp_impl_json_get_int(json_t const * object, char const * key, int default_value) { diff --git a/lib/webfuse_provider/impl/json_util.h b/lib/webfuse_provider/impl/util/json_util.h similarity index 100% rename from lib/webfuse_provider/impl/json_util.h rename to lib/webfuse_provider/impl/util/json_util.h diff --git a/lib/webfuse_provider/impl/lws_log.c b/lib/webfuse_provider/impl/util/lws_log.c similarity index 86% rename from lib/webfuse_provider/impl/lws_log.c rename to lib/webfuse_provider/impl/util/lws_log.c index ca08829..68b16bc 100644 --- a/lib/webfuse_provider/impl/lws_log.c +++ b/lib/webfuse_provider/impl/util/lws_log.c @@ -1,4 +1,4 @@ -#include "webfuse_provider/impl/lws_log.h" +#include "webfuse_provider/impl/util/lws_log.h" #include #include diff --git a/lib/webfuse_provider/impl/lws_log.h b/lib/webfuse_provider/impl/util/lws_log.h similarity index 100% rename from lib/webfuse_provider/impl/lws_log.h rename to lib/webfuse_provider/impl/util/lws_log.h diff --git a/lib/webfuse_provider/impl/slist.c b/lib/webfuse_provider/impl/util/slist.c similarity index 95% rename from lib/webfuse_provider/impl/slist.c rename to lib/webfuse_provider/impl/util/slist.c index e81d1d6..91b05ac 100644 --- a/lib/webfuse_provider/impl/slist.c +++ b/lib/webfuse_provider/impl/util/slist.c @@ -1,4 +1,4 @@ -#include "webfuse_provider/impl/slist.h" +#include "webfuse_provider/impl/util/slist.h" #include void wfp_slist_init( diff --git a/lib/webfuse_provider/impl/slist.h b/lib/webfuse_provider/impl/util/slist.h similarity index 93% rename from lib/webfuse_provider/impl/slist.h rename to lib/webfuse_provider/impl/util/slist.h index b16ac57..95d03b4 100644 --- a/lib/webfuse_provider/impl/slist.h +++ b/lib/webfuse_provider/impl/util/slist.h @@ -1,5 +1,5 @@ -#ifndef WFP_SLIST_H -#define WFP_SLIST_H +#ifndef WFP_UTIL_SLIST_H +#define WFP_UTIL_SLIST_H #ifndef __cplusplus #include diff --git a/lib/webfuse_provider/impl/url.c b/lib/webfuse_provider/impl/util/url.c similarity index 98% rename from lib/webfuse_provider/impl/url.c rename to lib/webfuse_provider/impl/util/url.c index a2f211e..b9bcf11 100644 --- a/lib/webfuse_provider/impl/url.c +++ b/lib/webfuse_provider/impl/util/url.c @@ -1,4 +1,4 @@ -#include "webfuse_provider/impl/url.h" +#include "webfuse_provider/impl/util/url.h" #include #include diff --git a/lib/webfuse_provider/impl/url.h b/lib/webfuse_provider/impl/util/url.h similarity index 88% rename from lib/webfuse_provider/impl/url.h rename to lib/webfuse_provider/impl/util/url.h index 21f00df..d85a25d 100644 --- a/lib/webfuse_provider/impl/url.h +++ b/lib/webfuse_provider/impl/util/url.h @@ -1,5 +1,5 @@ -#ifndef WFP_URL_H -#define WFP_URL_H +#ifndef WFP_UTIL_URL_H +#define WFP_UTIL_URL_H #ifndef __cplusplus #include diff --git a/lib/webfuse_provider/impl/util.h b/lib/webfuse_provider/impl/util/util.h similarity index 100% rename from lib/webfuse_provider/impl/util.h rename to lib/webfuse_provider/impl/util/util.h diff --git a/meson.build b/meson.build index 2b61bba..0bc2d96 100644 --- a/meson.build +++ b/meson.build @@ -17,14 +17,14 @@ pkg_config = import('pkgconfig') # Webfuse provider webfuse_provider_static = static_library('webfuse_provider', - 'lib/webfuse_provider/impl/slist.c', 'lib/webfuse_provider/impl/message.c', 'lib/webfuse_provider/impl/message_queue.c', 'lib/webfuse_provider/impl/status.c', - 'lib/webfuse_provider/impl/base64.c', - 'lib/webfuse_provider/impl/lws_log.c', - 'lib/webfuse_provider/impl/json_util.c', - 'lib/webfuse_provider/impl/url.c', + 'lib/webfuse_provider/impl/util/slist.c', + 'lib/webfuse_provider/impl/util/base64.c', + 'lib/webfuse_provider/impl/util/lws_log.c', + 'lib/webfuse_provider/impl/util/json_util.c', + 'lib/webfuse_provider/impl/util/url.c', 'lib/webfuse_provider/impl/timer/manager.c', 'lib/webfuse_provider/impl/timer/timepoint.c', 'lib/webfuse_provider/impl/timer/timer.c', @@ -100,6 +100,14 @@ test_certs_dep = declare_dependency( sources: [test_server_certs, test_client_certs]) alltests = executable('alltests', + 'test/webfuse_provider/test_util/timeout_watcher.cc', + 'test/webfuse_provider/test_util/ws_server.cc', + 'test/webfuse_provider/test_util/jansson_test_environment.cc', + 'test/webfuse_provider/mocks/fake_invokation_context.cc', + 'test/webfuse_provider/mocks/mock_request.cc', + '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/jsonrpc/mock_timer_callback.cc', 'test/webfuse_provider/jsonrpc/mock_timer.cc', 'test/webfuse_provider/jsonrpc/test_is_request.cc', @@ -110,22 +118,14 @@ alltests = executable('alltests', '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', - 'test/webfuse_provider/mocks/fake_invokation_context.cc', - 'test/webfuse_provider/mocks/mock_request.cc', - '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/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/util/test_util.cc', + 'test/webfuse_provider/util/test_container_of.cc', + 'test/webfuse_provider/util/test_slist.cc', + 'test/webfuse_provider/util/test_base64.cc', + 'test/webfuse_provider/util/test_status.cc', + 'test/webfuse_provider/util/test_message.cc', + 'test/webfuse_provider/util/test_message_queue.cc', + 'test/webfuse_provider/util/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', diff --git a/test/webfuse_provider/jsonrpc/mock_timer.cc b/test/webfuse_provider/jsonrpc/mock_timer.cc index 9360d38..cf01735 100644 --- a/test/webfuse_provider/jsonrpc/mock_timer.cc +++ b/test/webfuse_provider/jsonrpc/mock_timer.cc @@ -1,5 +1,5 @@ #include "webfuse_provider/jsonrpc/mock_timer.hpp" -#include "webfuse_provider/utils/wrap.hpp" +#include "webfuse_provider/test_util/wrap.hpp" extern "C" { diff --git a/test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc b/test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc index f299162..3231727 100644 --- a/test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc +++ b/test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc @@ -1,5 +1,5 @@ #include "webfuse_provider/mocks/mock_jsonrpc_proxy.hpp" -#include "webfuse_provider/utils/wrap.hpp" +#include "webfuse_provider/test_util/wrap.hpp" extern "C" { diff --git a/test/webfuse_provider/mocks/mock_operation_context.cc b/test/webfuse_provider/mocks/mock_operation_context.cc index d817cde..ff3e5a7 100644 --- a/test/webfuse_provider/mocks/mock_operation_context.cc +++ b/test/webfuse_provider/mocks/mock_operation_context.cc @@ -1,5 +1,5 @@ #include "webfuse_provider/mocks/mock_operation_context.hpp" -#include "webfuse/utils/wrap.hpp" +#include "webfuse/test_util/wrap.hpp" extern "C" { diff --git a/test/webfuse_provider/provider/test_client_protocol.cc b/test/webfuse_provider/provider/test_client_protocol.cc index 8e8253f..318b832 100644 --- a/test/webfuse_provider/provider/test_client_protocol.cc +++ b/test/webfuse_provider/provider/test_client_protocol.cc @@ -3,10 +3,10 @@ #include #include -#include "webfuse_provider/utils/ws_server.h" +#include "webfuse_provider/test_util/ws_server.h" #include "webfuse_provider/mocks/mock_provider_client.hpp" #include "webfuse_provider/protocol_names.h" -#include "webfuse_provider/utils/timeout_watcher.hpp" +#include "webfuse_provider/test_util/timeout_watcher.hpp" #include diff --git a/test/webfuse_provider/utils/jansson_test_environment.cc b/test/webfuse_provider/test_util/jansson_test_environment.cc similarity index 100% rename from test/webfuse_provider/utils/jansson_test_environment.cc rename to test/webfuse_provider/test_util/jansson_test_environment.cc diff --git a/test/webfuse_provider/utils/timeout_watcher.cc b/test/webfuse_provider/test_util/timeout_watcher.cc similarity index 93% rename from test/webfuse_provider/utils/timeout_watcher.cc rename to test/webfuse_provider/test_util/timeout_watcher.cc index 299eacf..28d13af 100644 --- a/test/webfuse_provider/utils/timeout_watcher.cc +++ b/test/webfuse_provider/test_util/timeout_watcher.cc @@ -1,4 +1,4 @@ -#include "webfuse_provider/utils/timeout_watcher.hpp" +#include "webfuse_provider/test_util/timeout_watcher.hpp" #include #include diff --git a/test/webfuse_provider/utils/timeout_watcher.hpp b/test/webfuse_provider/test_util/timeout_watcher.hpp similarity index 100% rename from test/webfuse_provider/utils/timeout_watcher.hpp rename to test/webfuse_provider/test_util/timeout_watcher.hpp diff --git a/test/webfuse_provider/utils/wrap.hpp b/test/webfuse_provider/test_util/wrap.hpp similarity index 100% rename from test/webfuse_provider/utils/wrap.hpp rename to test/webfuse_provider/test_util/wrap.hpp diff --git a/test/webfuse_provider/utils/ws_server.cc b/test/webfuse_provider/test_util/ws_server.cc similarity index 98% rename from test/webfuse_provider/utils/ws_server.cc rename to test/webfuse_provider/test_util/ws_server.cc index 3eb8c17..2386894 100644 --- a/test/webfuse_provider/utils/ws_server.cc +++ b/test/webfuse_provider/test_util/ws_server.cc @@ -1,5 +1,5 @@ -#include "webfuse_provider/utils/ws_server.h" -#include "webfuse_provider/impl/lws_log.h" +#include "webfuse_provider/test_util/ws_server.h" +#include "webfuse_provider/impl/util/lws_log.h" #include #include diff --git a/test/webfuse_provider/utils/ws_server.h b/test/webfuse_provider/test_util/ws_server.h similarity index 100% rename from test/webfuse_provider/utils/ws_server.h rename to test/webfuse_provider/test_util/ws_server.h diff --git a/test/webfuse_provider/core/test_base64.cc b/test/webfuse_provider/util/test_base64.cc similarity index 98% rename from test/webfuse_provider/core/test_base64.cc rename to test/webfuse_provider/util/test_base64.cc index 33e4c25..c743ca7 100644 --- a/test/webfuse_provider/core/test_base64.cc +++ b/test/webfuse_provider/util/test_base64.cc @@ -1,5 +1,5 @@ #include -#include "webfuse_provider/impl/base64.h" +#include "webfuse_provider/impl/util/base64.h" TEST(Base64, EncodedSize) { diff --git a/test/webfuse_provider/core/test_container_of.cc b/test/webfuse_provider/util/test_container_of.cc similarity index 89% rename from test/webfuse_provider/core/test_container_of.cc rename to test/webfuse_provider/util/test_container_of.cc index 75f5433..0fda6b2 100644 --- a/test/webfuse_provider/core/test_container_of.cc +++ b/test/webfuse_provider/util/test_container_of.cc @@ -1,5 +1,5 @@ #include -#include "webfuse_provider/impl/container_of.h" +#include "webfuse_provider/impl/util/container_of.h" namespace { diff --git a/test/webfuse_provider/core/test_message.cc b/test/webfuse_provider/util/test_message.cc similarity index 100% rename from test/webfuse_provider/core/test_message.cc rename to test/webfuse_provider/util/test_message.cc diff --git a/test/webfuse_provider/core/test_message_queue.cc b/test/webfuse_provider/util/test_message_queue.cc similarity index 96% rename from test/webfuse_provider/core/test_message_queue.cc rename to test/webfuse_provider/util/test_message_queue.cc index ec0b254..3f135c2 100644 --- a/test/webfuse_provider/core/test_message_queue.cc +++ b/test/webfuse_provider/util/test_message_queue.cc @@ -1,7 +1,7 @@ #include #include "webfuse_provider/impl/message_queue.h" #include "webfuse_provider/impl/message.h" -#include "webfuse_provider/impl/slist.h" +#include "webfuse_provider/impl/util/slist.h" namespace { diff --git a/test/webfuse_provider/core/test_slist.cc b/test/webfuse_provider/util/test_slist.cc similarity index 98% rename from test/webfuse_provider/core/test_slist.cc rename to test/webfuse_provider/util/test_slist.cc index b15b7fb..177a585 100644 --- a/test/webfuse_provider/core/test_slist.cc +++ b/test/webfuse_provider/util/test_slist.cc @@ -1,5 +1,5 @@ #include -#include "webfuse_provider/impl/slist.h" +#include "webfuse_provider/impl/util/slist.h" TEST(wfp_slist, init) { diff --git a/test/webfuse_provider/core/test_status.cc b/test/webfuse_provider/util/test_status.cc similarity index 100% rename from test/webfuse_provider/core/test_status.cc rename to test/webfuse_provider/util/test_status.cc diff --git a/test/webfuse_provider/core/test_url.cc b/test/webfuse_provider/util/test_url.cc similarity index 97% rename from test/webfuse_provider/core/test_url.cc rename to test/webfuse_provider/util/test_url.cc index 6e65373..ea908c4 100644 --- a/test/webfuse_provider/core/test_url.cc +++ b/test/webfuse_provider/util/test_url.cc @@ -1,6 +1,6 @@ #include -#include "webfuse_provider/impl/url.h" +#include "webfuse_provider/impl/util/url.h" TEST(url, ParseWs) { diff --git a/test/webfuse_provider/core/test_util.cc b/test/webfuse_provider/util/test_util.cc similarity index 95% rename from test/webfuse_provider/core/test_util.cc rename to test/webfuse_provider/util/test_util.cc index 9879f74..be992db 100644 --- a/test/webfuse_provider/core/test_util.cc +++ b/test/webfuse_provider/util/test_util.cc @@ -1,5 +1,5 @@ #include -#include "webfuse_provider/impl/json_util.h" +#include "webfuse_provider/impl/util/json_util.h" TEST(jsonrpc_util, get_int) {