refactored tests

2026-03-02 04:09:19 +00:00 · 2020-03-20 13:48:58 +01:00
parent 364d19bdea
commit 933789b045
32 changed files with 51 additions and 50 deletions
--- a/test/test_auth_factory.cc
+++ b/test/test_auth_factory.cc
@@ -2,7 +2,7 @@
 #include "webfused/auth/factory.h"
 #include "webfused/auth/authenticator.h"
 #include "webfused/log/log.h"
-#include "mock_logger.hpp"
+#include "mock/logger.hpp"

 using ::testing::_;
 using ::webfused_test::MockLogger;
--- a/test/auth/file_authenticator.cc
+++ b/test/auth/file_authenticator.cc
@@ -3,8 +3,8 @@
 #include "webfused/config/settings.h"
 #include "webfused/auth/factory.h"

-#include "mock_credentials.hpp"
-#include "mock_settings.hpp"
+#include "mock/credentials.hpp"
+#include "mock/settings.hpp"

 #include <gtest/gtest.h>
 #include <libconfig.h>
--- a/test/auth/pam_authenticator.cc
+++ b/test/auth/pam_authenticator.cc
@@ -3,9 +3,9 @@
 #include "webfused/config/settings.h"
 #include "webfused/auth/factory.h"

-#include "mock_credentials.hpp"
-#include "mock_settings.hpp"
-#include "mock_pam.hpp"
+#include "mock/credentials.hpp"
+#include "mock/settings.hpp"
+#include "mock/pam.hpp"

 #include <gtest/gtest.h>

--- a/test/test_change_user.cc
+++ b/test/test_change_user.cc
@@ -1,5 +1,5 @@
 #include "webfused/change_user.h"
-#include "mock_linux.hpp"
+#include "mock/linux.hpp"
 #include <gtest/gtest.h>

 using ::webfused_test::MockLinux;
--- a/test/config/config.cc
+++ b/test/config/config.cc
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
 #include "webfused/config/config.h"
 #include "webfused/config/config_intern.h"
-#include "mock_settings.hpp"
+#include "mock/settings.hpp"

 #include "webfused/log/logger.h"
 #include "webfused/log/log.h"
-#include "mock_logger.hpp"
+#include "mock/logger.hpp"
 using ::webfused_test::MockLogger;
 using ::testing::_;

--- a/test/test_config_factory.cc
+++ b/test/test_config_factory.cc
@@ -3,9 +3,9 @@
 #include "webfused/config/factory.h"
 #include "webfused/log/logger.h"
 #include "webfused/log/log.h"
-#include "mock_logger.hpp"
-#include "mock_config_builder.hpp"
-#include "mock_libconfig.hpp"
+#include "mock/logger.hpp"
+#include "mock/config_builder.hpp"
+#include "mock/libconfig.hpp"

 using ::testing::_;
 using ::testing::Return;
--- a/test/config/settings.cc
+++ b/test/config/settings.cc
--- a/test/test_daemon.cc
+++ b/test/test_daemon.cc
@@ -1,6 +1,6 @@
 #include "webfused/daemon.h"

-#include "mock_server.hpp"
+#include "mock/server.hpp"

 #include <gtest/gtest.h>
 #include <cstdlib>
--- a/test/test_log.cc
+++ b/test/test_log.cc
@@ -3,7 +3,7 @@

 #include "webfused/log/logger.h"
 #include "webfused/log/log.h"
-#include "mock_logger.hpp"
+#include "mock/logger.hpp"

 using ::testing::_;
 using ::testing::StrEq;
--- a/test/test_log_manager.cc
+++ b/test/test_log_manager.cc
--- a/test/test_stderr_logger.cc
+++ b/test/test_stderr_logger.cc
--- a/test/test_syslog_logger.cc
+++ b/test/test_syslog_logger.cc
@@ -3,7 +3,7 @@
 #include "webfused/log/logger.h"
 #include "webfused/log/log.h"

-#include "mock_settings.hpp"
+#include "mock/settings.hpp"

 #include <gtest/gtest.h>
 #include <stddef.h>
--- a/test/mock/config_builder.cc
+++ b/test/mock/config_builder.cc
@@ -1,4 +1,4 @@
-#include "mock_config_builder.hpp"
+#include "mock/config_builder.hpp"

 extern "C"
 {
--- a/test/mock/config_builder.hpp
+++ b/test/mock/config_builder.hpp
--- a/test/mock/credentials.cc
+++ b/test/mock/credentials.cc
@@ -1,4 +1,4 @@
-#include "mock_credentials.hpp"
+#include "mock/credentials.hpp"


 extern "C"
--- a/test/mock/credentials.hpp
+++ b/test/mock/credentials.hpp
--- a/test/mock/libconfig.cc
+++ b/test/mock/libconfig.cc
@@ -1,5 +1,5 @@
-#include "mock_libconfig.hpp"
-#include "wrap_utils.hpp"
+#include "mock/libconfig.hpp"
+#include "util/wrap.hpp"

 extern "C"
 {
--- a/test/mock/libconfig.hpp
+++ b/test/mock/libconfig.hpp
--- a/test/mock/linux.cc
+++ b/test/mock/linux.cc
@@ -1,5 +1,5 @@
-#include "mock_linux.hpp"
-#include "wrap_utils.hpp"
+#include "mock/linux.hpp"
+#include "util/wrap.hpp"

 extern "C"
 {
--- a/test/mock/linux.hpp
+++ b/test/mock/linux.hpp
--- a/test/mock/logger.cc
+++ b/test/mock/logger.cc
@@ -1,4 +1,4 @@
-#include "mock_logger.hpp"
+#include "mock/logger.hpp"
 #include "webfused/log/logger.h"
 #include "webfused/log/log.h"

--- a/test/mock/logger.hpp
+++ b/test/mock/logger.hpp
--- a/test/mock/pam.cc
+++ b/test/mock/pam.cc
@@ -1,4 +1,4 @@
-#include "mock_pam.hpp"
+#include "mock/pam.hpp"

 extern "C"
 {
--- a/test/mock/pam.hpp
+++ b/test/mock/pam.hpp
--- a/test/mock/server.cc
+++ b/test/mock/server.cc
@@ -1,5 +1,5 @@
-#include "mock_server.hpp"
-#include "wrap_utils.hpp"
+#include "mock/server.hpp"
+#include "util/wrap.hpp"

 extern "C"
 {
--- a/test/mock/server.hpp
+++ b/test/mock/server.hpp
--- a/test/mock/settings.cc
+++ b/test/mock/settings.cc
@@ -1,4 +1,4 @@
-#include "mock_settings.hpp"
+#include "mock/settings.hpp"

 extern "C"
 {
--- a/test/mock/settings.hpp
+++ b/test/mock/settings.hpp
--- a/test/test_mountpoint_factory.cc
+++ b/test/test_mountpoint_factory.cc
--- a/test/test_userdb.cc
+++ b/test/test_userdb.cc
--- a/test/wrap_utils.hpp
+++ b/test/wrap_utils.hpp
@@ -1,5 +1,5 @@
-#ifndef WFD_WRAP_UTILS_HPP
-#define WFD_WRAP_UTILS_HPP
+#ifndef WFD_UTIL_WRAP_HPP
+#define WFD_UTIL_WRAP_HPP

 #define WFD_WRAP_FUNC0( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME ) \
    extern RETURN_TYPE __real_ ## FUNC_NAME (); \