organized unit tests

cmake/unit_tests.cmake

@@ -7,47 +7,47 @@ include(GoogleTest)
 pkg_check_modules(GMOCK gmock)
 
 add_executable(alltests
-	test/tempdir.cc
-	test/file_utils.cc
-	test/msleep.cc
-	test/die_if.cc
-	test/timeout_watcher.cc
-	test/fake_adapter_server.cc
-	test/mock_authenticator.cc
-	test/mock_request.cc
-	test/core/test_container_of.cc
-	test/core/test_string.cc
-	test/core/test_slist.cc
-	test/core/test_path.cc
-	test/core/test_base64.cc
-	test/core/test_status.cc
-	test/core/test_message.cc
-	test/core/test_message_queue.cc
-	test/adapter/test_response_parser.cc
-	test/adapter/test_server.cc
-	test/adapter/test_server_config.cc
-	test/adapter/test_timepoint.cc
-	test/adapter/test_timer.cc
-	test/adapter/test_credentials.cc
-	test/adapter/test_authenticator.cc
-	test/adapter/test_authenticators.cc
-	test/adapter/test_mountpoint.cc
-	test/adapter/test_uuid_mountpoint.cc
-	test/adapter/test_uuid_mountpoint_factory.cc
-	test/adapter/test_fuse_req.cc
-	test/adapter/jsonrpc/test_util.cc
-	test/adapter/jsonrpc/test_is_request.cc
-	test/adapter/jsonrpc/test_request.cc
-	test/adapter/jsonrpc/test_is_response.cc
-	test/adapter/jsonrpc/test_response.cc
-	test/adapter/jsonrpc/test_server.cc
-	test/adapter/jsonrpc/test_proxy.cc
-	test/provider/test_url.cc
-	test/provider/test_static_filesystem.cc
-	test/provider/test_client_protocol.cc
-	test/integration/test_integration.cc
-	test/integration/server.cc
-	test/integration/provider.cc
+	test/webfuse/utils/tempdir.cc
+	test/webfuse/utils/file_utils.cc
+	test/webfuse/utils/msleep.cc
+	test/webfuse/utils/die_if.cc
+	test/webfuse/utils/timeout_watcher.cc
+	test/webfuse/fakes/fake_adapter_server.cc
+	test/webfuse/mocks/mock_authenticator.cc
+	test/webfuse/mocks/mock_request.cc
+	test/webfuse/tests/core/test_container_of.cc
+	test/webfuse/tests/core/test_string.cc
+	test/webfuse/tests/core/test_slist.cc
+	test/webfuse/tests/core/test_path.cc
+	test/webfuse/tests/core/test_base64.cc
+	test/webfuse/tests/core/test_status.cc
+	test/webfuse/tests/core/test_message.cc
+	test/webfuse/tests/core/test_message_queue.cc
+	test/webfuse/tests/adapter/test_response_parser.cc
+	test/webfuse/tests/adapter/test_server.cc
+	test/webfuse/tests/adapter/test_server_config.cc
+	test/webfuse/tests/adapter/test_timepoint.cc
+	test/webfuse/tests/adapter/test_timer.cc
+	test/webfuse/tests/adapter/test_credentials.cc
+	test/webfuse/tests/adapter/test_authenticator.cc
+	test/webfuse/tests/adapter/test_authenticators.cc
+	test/webfuse/tests/adapter/test_mountpoint.cc
+	test/webfuse/tests/adapter/test_uuid_mountpoint.cc
+	test/webfuse/tests/adapter/test_uuid_mountpoint_factory.cc
+	test/webfuse/tests/adapter/test_fuse_req.cc
+	test/webfuse/tests/adapter/jsonrpc/test_util.cc
+	test/webfuse/tests/adapter/jsonrpc/test_is_request.cc
+	test/webfuse/tests/adapter/jsonrpc/test_request.cc
+	test/webfuse/tests/adapter/jsonrpc/test_is_response.cc
+	test/webfuse/tests/adapter/jsonrpc/test_response.cc
+	test/webfuse/tests/adapter/jsonrpc/test_server.cc
+	test/webfuse/tests/adapter/jsonrpc/test_proxy.cc
+	test/webfuse/tests/provider/test_url.cc
+	test/webfuse/tests/provider/test_static_filesystem.cc
+	test/webfuse/tests/provider/test_client_protocol.cc
+	test/webfuse/tests/integration/test_integration.cc
+	test/webfuse/tests/integration/server.cc
+	test/webfuse/tests/integration/provider.cc
 )
 
 target_include_directories(alltests PRIVATE

test/webfuse/fakes/fake_adapter_server.cc

@@ -1,5 +1,5 @@
-#include "fake_adapter_server.hpp"
-#include "timeout_watcher.hpp"
+#include "webfuse/fakes/fake_adapter_server.hpp"
+#include "webfuse/utils/timeout_watcher.hpp"
 
 #include "webfuse/core/util.h"
 #include <libwebsockets.h>

test/webfuse/mocks/mock_authenticator.cc

@@ -1,4 +1,4 @@
-#include "mock_authenticator.hpp"
+#include "webfuse/mocks/mock_authenticator.hpp"
 
 #define WF_AUTHENTICATOR_COUNT 3
 

test/webfuse/mocks/mock_request.cc

@@ -1,4 +1,4 @@
-#include "mock_request.hpp"
+#include "webfuse/mocks/mock_request.hpp"
 #include <cstdlib>
 
 namespace

test/webfuse/tests/adapter/jsonrpc/test_proxy.cc

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "webfuse/adapter/impl/jsonrpc/proxy.h"
 #include "webfuse/adapter/impl/time/timeout_manager.h"
-#include "msleep.hpp"
+#include "webfuse/utils/msleep.hpp"
 
 using webfuse_test::msleep;
 

test/webfuse/tests/adapter/test_authenticator.cc

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "mock_authenticator.hpp"
+#include "webfuse/mocks/mock_authenticator.hpp"
 
 #include "webfuse/adapter/impl/authenticator.h"
 #include "webfuse/adapter/impl/credentials.h"

test/webfuse/tests/adapter/test_authenticators.cc

@@ -3,7 +3,7 @@
 
 #include "webfuse/adapter/impl/authenticators.h"
 #include "webfuse/adapter/impl/credentials.h"
-#include "mock_authenticator.hpp"
+#include "webfuse/mocks/mock_authenticator.hpp"
 
 using ::testing::_;
 using ::testing::Return;

test/webfuse/tests/adapter/test_server_config.cc

@@ -2,7 +2,7 @@
 #include "webfuse/adapter/server_config.h"
 #include "webfuse/adapter/impl/server_config.h"
 #include "webfuse/adapter/impl/authenticator.h"
-#include "tempdir.hpp"
+#include "webfuse/utils/tempdir.hpp"
 
 using webfuse_test::TempDir;
 

test/webfuse/tests/adapter/test_timepoint.cc

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "msleep.hpp"
+#include "webfuse/utils/msleep.hpp"
 #include "webfuse/adapter/impl/time/timepoint.h"
 
 using webfuse_test::msleep;

test/webfuse/tests/adapter/test_timer.cc

@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "msleep.hpp"
+#include "webfuse/utils/msleep.hpp"
 #include "webfuse/adapter/impl/time/timer.h"
 #include "webfuse/adapter/impl/time/timeout_manager.h"
 

test/webfuse/tests/adapter/test_uuid_mountpoint.cc

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include "tempdir.hpp"
-#include "file_utils.hpp"
+#include "webfuse/utils/tempdir.hpp"
+#include "webfuse/utils/file_utils.hpp"
 #include "webfuse_adapter.h"
 #include "webfuse/adapter/impl/uuid_mountpoint.h"
 

test/webfuse/tests/adapter/test_uuid_mountpoint_factory.cc

@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 #include "webfuse_adapter.h"
 #include "webfuse/adapter/impl/uuid_mountpoint_factory.h"
-#include "tempdir.hpp"
-#include "file_utils.hpp"
+#include "webfuse/utils/tempdir.hpp"
+#include "webfuse/utils/file_utils.hpp"
 
 using webfuse_test::TempDir;
 using webfuse_test::is_dir;

test/webfuse/tests/integration/provider.cc

@@ -1,10 +1,10 @@
-#include "integration/provider.hpp"
+#include "webfuse/tests/integration/provider.hpp"
 #include "webfuse_provider.h"
 #include "webfuse/provider/impl/client.h"
 #include <thread>
 #include <mutex>
 #include <string>
-#include "msleep.hpp"
+#include "webfuse/utils/msleep.hpp"
 
 namespace webfuse_test
 {

test/webfuse/tests/integration/server.cc

@@ -1,4 +1,4 @@
-#include "integration/server.hpp"
+#include "webfuse/tests/integration/server.hpp"
 #include <thread>
 #include <mutex>
 #include <cstdlib>
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include "webfuse_adapter.h"
 #include "webfuse/adapter/impl/server.h"
-#include "msleep.hpp"
+#include "webfuse/utils/msleep.hpp"
 
 #define WF_PATH_MAX (100)
 

test/webfuse/tests/integration/test_integration.cc

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include "integration/server.hpp"
-#include "integration/provider.hpp"
+#include "webfuse/tests/integration/server.hpp"
+#include "webfuse/tests/integration/provider.hpp"
 
 #include <cstdio>
 #include <csignal>
@@ -15,7 +15,7 @@
 
 #include <jansson.h>
 #include "webfuse/core/lws_log.h"
-#include "die_if.hpp"
+#include "webfuse/utils/die_if.hpp"
 
 using webfuse_test::Server;
 using webfuse_test::Provider;

test/webfuse/tests/provider/test_client_protocol.cc

@@ -3,7 +3,7 @@
 
 #include <webfuse/provider/client_protocol.h>
 #include <webfuse/provider/client_config.h>
-#include "fake_adapter_server.hpp"
+#include "webfuse/fakes/fake_adapter_server.hpp"
 
 #include <cstring>
 #include <thread>

test/webfuse/tests/provider/test_static_filesystem.cc

@@ -4,7 +4,7 @@
 #include "webfuse/provider/client_config.h"
 #include "webfuse/provider/impl/client_config.h"
 
-#include "mock_request.hpp"
+#include "webfuse/mocks/mock_request.hpp"
 
 using webfuse_test::request_create;
 using webfuse_test::MockRequest;

test/webfuse/utils/die_if.cc

@@ -1,4 +1,4 @@
-#include "die_if.hpp"
+#include "webfuse/utils/die_if.hpp"
 #include <cstdlib>
 
 namespace webfuse_test

test/webfuse/utils/file_utils.cc

@@ -1,4 +1,4 @@
-#include "file_utils.hpp"
+#include "webfuse/utils/file_utils.hpp"
 
 #include <sys/types.h>
 #include <sys/stat.h>

test/webfuse/utils/msleep.cc

@@ -1,4 +1,4 @@
-#include "msleep.hpp"
+#include "webfuse/utils/msleep.hpp"
 #include <ctime>
 
 namespace webfuse_test

test/webfuse/utils/tempdir.cc

@@ -1,5 +1,5 @@
 #include "webfuse/core/string.h"
-#include "tempdir.hpp"
+#include "webfuse/utils/tempdir.hpp"
 
 #include <unistd.h>
 #include <cstdlib>

test/webfuse/utils/timeout_watcher.cc

@@ -1,4 +1,4 @@
-#include "timeout_watcher.hpp"
+#include "webfuse/utils/timeout_watcher.hpp"
 #include <stdexcept>
 
 using std::chrono::milliseconds;