mirror of
https://github.com/falk-werner/webfuse
synced 2024-10-27 20:34:10 +00:00
refactor: renamed utils into test_util
This commit is contained in:
parent
a30d21fec8
commit
d205e69748
14
meson.build
14
meson.build
@ -124,13 +124,13 @@ alltests = executable('alltests',
|
|||||||
'test/webfuse/tests/core/jsonrpc/test_response_parser.cc',
|
'test/webfuse/tests/core/jsonrpc/test_response_parser.cc',
|
||||||
'test/webfuse/tests/core/timer/test_timepoint.cc',
|
'test/webfuse/tests/core/timer/test_timepoint.cc',
|
||||||
'test/webfuse/tests/core/timer/test_timer.cc',
|
'test/webfuse/tests/core/timer/test_timer.cc',
|
||||||
'test/webfuse/utils/tempdir.cc',
|
'test/webfuse/test_util/tempdir.cc',
|
||||||
'test/webfuse/utils/file_utils.cc',
|
'test/webfuse/test_util/file_utils.cc',
|
||||||
'test/webfuse/utils/timeout_watcher.cc',
|
'test/webfuse/test_util/timeout_watcher.cc',
|
||||||
'test/webfuse/utils/ws_server.cc',
|
'test/webfuse/test_util/ws_server.cc',
|
||||||
'test/webfuse/utils/ws_server2.cc',
|
'test/webfuse/test_util/ws_server2.cc',
|
||||||
'test/webfuse/utils/adapter_client.cc',
|
'test/webfuse/test_util/adapter_client.cc',
|
||||||
'test/webfuse/utils/jansson_test_environment.cc',
|
'test/webfuse/test_util/jansson_test_environment.cc',
|
||||||
'test/webfuse/mocks/mock_authenticator.cc',
|
'test/webfuse/mocks/mock_authenticator.cc',
|
||||||
'test/webfuse/mocks/mock_fuse.cc',
|
'test/webfuse/mocks/mock_fuse.cc',
|
||||||
'test/webfuse/mocks/mock_operation_context.cc',
|
'test/webfuse/mocks/mock_operation_context.cc',
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "webfuse/mocks/mock_fuse.hpp"
|
#include "webfuse/mocks/mock_fuse.hpp"
|
||||||
#include "webfuse/utils/wrap.hpp"
|
#include "webfuse/test_util/wrap.hpp"
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef WF_MOCK_INVOKATION_HANDLER_HPP
|
#ifndef WF_MOCK_INVOKATION_HANDLER_HPP
|
||||||
#define WF_MOCK_INVOKATION_HANDLER_HPP
|
#define WF_MOCK_INVOKATION_HANDLER_HPP
|
||||||
|
|
||||||
#include "webfuse/utils/ws_server2.hpp"
|
#include "webfuse/test_util/ws_server2.hpp"
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
namespace webfuse_test
|
namespace webfuse_test
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "webfuse/mocks/mock_jsonrpc_proxy.hpp"
|
#include "webfuse/mocks/mock_jsonrpc_proxy.hpp"
|
||||||
#include "webfuse/utils/wrap.hpp"
|
#include "webfuse/test_util/wrap.hpp"
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "webfuse/mocks/mock_operation_context.hpp"
|
#include "webfuse/mocks/mock_operation_context.hpp"
|
||||||
#include "webfuse/utils/wrap.hpp"
|
#include "webfuse/test_util/wrap.hpp"
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "webfuse/utils/adapter_client.hpp"
|
#include "webfuse/test_util/adapter_client.hpp"
|
||||||
#include "webfuse/utils/tempdir.hpp"
|
#include "webfuse/test_util/tempdir.hpp"
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef WF_UTILS_ADAPTER_CLIENT_HPP
|
#ifndef WF_TEST_UTIL_ADAPTER_CLIENT_HPP
|
||||||
#define WF_UTILS_APAPTER_CLIENT_HPP
|
#define WF_TEST_UTIL_APAPTER_CLIENT_HPP
|
||||||
|
|
||||||
#include "webfuse/client.h"
|
#include "webfuse/client.h"
|
||||||
#include <string>
|
#include <string>
|
@ -1,4 +1,4 @@
|
|||||||
#include "webfuse/utils/file_utils.hpp"
|
#include "webfuse/test_util/file_utils.hpp"
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef WF_TEST_FILE_UTILS_HPP
|
#ifndef WF_TEST_UTIL_FILE_UTILS_HPP
|
||||||
#define WF_TEST_FILE_UTILS_HPP
|
#define WF_TEST_UTIL_FILE_UTILS_HPP
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
#include "webfuse/utils/tempdir.hpp"
|
#include "webfuse/test_util/tempdir.hpp"
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef WF_TEST_TEMPDIR_HPP
|
#ifndef WF_TEST_UTIL_TEMPDIR_HPP
|
||||||
#define WF_TEST_TEMPDIR_HPP
|
#define WF_TEST_UTIL_TEMPDIR_HPP
|
||||||
|
|
||||||
namespace webfuse_test
|
namespace webfuse_test
|
||||||
{
|
{
|
@ -1,4 +1,4 @@
|
|||||||
#include "webfuse/utils/timeout_watcher.hpp"
|
#include "webfuse/test_util/timeout_watcher.hpp"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef WF_TEST_TIMEOUT_WATCHER_HPP
|
#ifndef WF_TEST_UTIL_TIMEOUT_WATCHER_HPP
|
||||||
#define WF_TEST_TIMEOUT_WATCHER_HPP
|
#define WF_TEST_UTIL_TIMEOUT_WATCHER_HPP
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <functional>
|
#include <functional>
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef WF_WRAP_HPP
|
#ifndef WF_TEST_UTIL_WRAP_HPP
|
||||||
#define WF_WRAP_HPP
|
#define WF_TEST_UTIL_WRAP_HPP
|
||||||
|
|
||||||
#define WF_WRAP_FUNC0( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME ) \
|
#define WF_WRAP_FUNC0( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME ) \
|
||||||
extern RETURN_TYPE __real_ ## FUNC_NAME (); \
|
extern RETURN_TYPE __real_ ## FUNC_NAME (); \
|
@ -1,4 +1,4 @@
|
|||||||
#include "webfuse/utils/ws_server.h"
|
#include "webfuse/test_util/ws_server.h"
|
||||||
#include "webfuse/impl/util/lws_log.h"
|
#include "webfuse/impl/util/lws_log.h"
|
||||||
|
|
||||||
#include <libwebsockets.h>
|
#include <libwebsockets.h>
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef WF_TEST_UTILS_WS_SERVER_HPP
|
#ifndef WF_TEST_UTIL_WS_SERVER_HPP
|
||||||
#define WF_TEST_UTILS_WS_SERVER_HPP
|
#define WF_TEST_UTIL_WS_SERVER_HPP
|
||||||
|
|
||||||
#include <jansson.h>
|
#include <jansson.h>
|
||||||
#include <string>
|
#include <string>
|
@ -1,4 +1,4 @@
|
|||||||
#include "webfuse/utils/ws_server2.hpp"
|
#include "webfuse/test_util/ws_server2.hpp"
|
||||||
#include "webfuse/impl/util/lws_log.h"
|
#include "webfuse/impl/util/lws_log.h"
|
||||||
|
|
||||||
#include <libwebsockets.h>
|
#include <libwebsockets.h>
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef WF_TEST_UTILS_WS_SERVER2_HPP
|
#ifndef WF_TEST_UTIL_WS_SERVER2_HPP
|
||||||
#define WF_TEST_UTILS_WS_SERVER2_HPP
|
#define WF_TEST_UTIL_WS_SERVER2_HPP
|
||||||
|
|
||||||
#include <jansson.h>
|
#include <jansson.h>
|
||||||
#include <string>
|
#include <string>
|
@ -1,14 +1,14 @@
|
|||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <gmock/gmock.h>
|
#include <gmock/gmock.h>
|
||||||
|
|
||||||
#include "webfuse/utils/adapter_client.hpp"
|
#include "webfuse/test_util/adapter_client.hpp"
|
||||||
#include "webfuse/client_tlsconfig.h"
|
#include "webfuse/client_tlsconfig.h"
|
||||||
#include "webfuse/credentials.h"
|
#include "webfuse/credentials.h"
|
||||||
#include "webfuse/protocol_names.h"
|
#include "webfuse/protocol_names.h"
|
||||||
#include "webfuse/utils/ws_server2.hpp"
|
#include "webfuse/test_util/ws_server2.hpp"
|
||||||
#include "webfuse/mocks/mock_adapter_client_callback.hpp"
|
#include "webfuse/mocks/mock_adapter_client_callback.hpp"
|
||||||
#include "webfuse/mocks/mock_invokation_handler.hpp"
|
#include "webfuse/mocks/mock_invokation_handler.hpp"
|
||||||
#include "webfuse/utils/timeout_watcher.hpp"
|
#include "webfuse/test_util/timeout_watcher.hpp"
|
||||||
#include "webfuse/tests/integration/file.hpp"
|
#include "webfuse/tests/integration/file.hpp"
|
||||||
#include "webfuse/mocks/lookup_matcher.hpp"
|
#include "webfuse/mocks/lookup_matcher.hpp"
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#include "webfuse/server_config.h"
|
#include "webfuse/server_config.h"
|
||||||
#include "webfuse/impl/server_config.h"
|
#include "webfuse/impl/server_config.h"
|
||||||
#include "webfuse/impl/authenticator.h"
|
#include "webfuse/impl/authenticator.h"
|
||||||
#include "webfuse/utils/tempdir.hpp"
|
#include "webfuse/test_util/tempdir.hpp"
|
||||||
|
|
||||||
using webfuse_test::TempDir;
|
using webfuse_test::TempDir;
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "webfuse/tests/core/jsonrpc/mock_timer.hpp"
|
#include "webfuse/tests/core/jsonrpc/mock_timer.hpp"
|
||||||
#include "webfuse/utils/wrap.hpp"
|
#include "webfuse/test_util/wrap.hpp"
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#include "webfuse_provider.h"
|
#include "webfuse_provider.h"
|
||||||
#include <libwebsockets.h>
|
#include <libwebsockets.h>
|
||||||
|
|
||||||
#include "webfuse/utils/tempdir.hpp"
|
#include "webfuse/test_util/tempdir.hpp"
|
||||||
|
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user