diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/app_event_operators.cpp | 2 | ||||
| -rw-r--r-- | tests/logic_.cpp | 2 | ||||
| -rw-r--r-- | tests/main.cpp | 3 | ||||
| -rw-r--r-- | tests/popup_test.cpp | 3 | ||||
| -rw-r--r-- | tests/queue_test_thread.cpp | 2 | ||||
| -rw-r--r-- | tests/test_app.cpp | 2 | ||||
| -rw-r--r-- | tests/test_certs.cpp | 2 | ||||
| -rw-r--r-- | tests/test_db.cpp | 3 | ||||
| -rw-r--r-- | tests/test_logic.cpp | 3 | ||||
| -rw-r--r-- | tests/test_queue.cpp | 3 |
11 files changed, 14 insertions, 18 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ff25260..651072c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,7 +9,6 @@ PKG_CHECK_MODULES(CERT_CHECKER_TESTS_DEP gio-2.0 icu-i18n key-manager - libsystemd-journal sqlite3 pkgmgr pkgmgr-info @@ -37,8 +36,6 @@ SET(CERT_CHECKER_TESTS_SOURCES ${CERT_CHECKER_SERVICE_PATH}/app.cpp ${CERT_CHECKER_SERVICE_PATH}/queue.cpp ${CERT_CHECKER_SERVICE_PATH}/certs.cpp - # logs - ${CERT_CHECKER_LOG_PATH}/log.cpp # dpl ${DPL_CORE_SRC_PATH}/assert.cpp ${DPL_CORE_SRC_PATH}/char_traits.cpp @@ -65,8 +62,6 @@ SET(CERT_CHECKER_TESTS_LOGIC_SOURCES ${CERT_CHECKER_SERVICE_PATH}/logic.cpp ${CERT_CHECKER_SERVICE_PATH}/app.cpp ${CERT_CHECKER_SERVICE_PATH}/queue.cpp - # logs - ${CERT_CHECKER_LOG_PATH}/log.cpp # dpl ${DPL_CORE_SRC_PATH}/colors.cpp ) @@ -78,8 +73,6 @@ SET(CERT_CHECKER_POPUP_TEST_SOURCES ${CERT_CHECKER_SERVICE_PATH}/app.cpp ${CERT_CHECKER_UI_PATH}/popup-runner.cpp ${CERT_CHECKER_UI_PATH}/UIBackend.cpp - # logs - ${CERT_CHECKER_LOG_PATH}/log.cpp ) INCLUDE_DIRECTORIES(SYSTEM diff --git a/tests/app_event_operators.cpp b/tests/app_event_operators.cpp index 6fb2c2e..131e511 100644 --- a/tests/app_event_operators.cpp +++ b/tests/app_event_operators.cpp @@ -20,7 +20,7 @@ * @brief Implementation of app_test class (from app_t) */ -#include <cchecker/log.h> +#include "common/log.h" #include <app_event_operators.h> //using namespace CCHECKER; diff --git a/tests/logic_.cpp b/tests/logic_.cpp index 0259bd6..5679b96 100644 --- a/tests/logic_.cpp +++ b/tests/logic_.cpp @@ -25,7 +25,7 @@ * Some of methods are stubbed, and some of them just calls corresponding methods from Logic Class. */ -#include <cchecker/log.h> +#include "common/log.h" #include <chrono> #include <boost/test/unit_test.hpp> diff --git a/tests/main.cpp b/tests/main.cpp index 5ac4ab5..8fe6733 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -25,7 +25,8 @@ #include <boost/test/results_reporter.hpp> #include <colour_log_formatter.h> -#include <cchecker/log.h> + +#include "common/log.h" struct TestConfig { TestConfig() { diff --git a/tests/popup_test.cpp b/tests/popup_test.cpp index d08747e..3f6676d 100644 --- a/tests/popup_test.cpp +++ b/tests/popup_test.cpp @@ -21,7 +21,8 @@ */ #include <cchecker/UIBackend.h> -#include <cchecker/log.h> + +#include "common/log.h" using namespace CCHECKER; diff --git a/tests/queue_test_thread.cpp b/tests/queue_test_thread.cpp index b553dde..b98ddc1 100644 --- a/tests/queue_test_thread.cpp +++ b/tests/queue_test_thread.cpp @@ -25,7 +25,7 @@ #include "service/app.h" #include "service/queue.h" -#include <cchecker/log.h> +#include "common/log.h" #include <queue_test_thread.h> diff --git a/tests/test_app.cpp b/tests/test_app.cpp index 295d724..c32d571 100644 --- a/tests/test_app.cpp +++ b/tests/test_app.cpp @@ -23,7 +23,7 @@ #include <boost/test/unit_test.hpp> #include <string> -#include <cchecker/log.h> +#include "common/log.h" #include <app_event_operators.h> using namespace CCHECKER; diff --git a/tests/test_certs.cpp b/tests/test_certs.cpp index b206ead..e9f5b34 100644 --- a/tests/test_certs.cpp +++ b/tests/test_certs.cpp @@ -24,7 +24,7 @@ #include <string> #include <thread> -#include <cchecker/log.h> +#include "common/log.h" #include <certs_.h> #include <app_event_operators.h> diff --git a/tests/test_db.cpp b/tests/test_db.cpp index 31e7bf6..9649087 100644 --- a/tests/test_db.cpp +++ b/tests/test_db.cpp @@ -24,10 +24,11 @@ #include <boost/test/unit_test.hpp> #include <string> -#include <cchecker/log.h> #include <dbfixture.h> #include <app_event_operators.h> +#include "common/log.h" + BOOST_FIXTURE_TEST_SUITE(DB_TEST, DBFixture) BOOST_AUTO_TEST_CASE(DB_app_positive) { diff --git a/tests/test_logic.cpp b/tests/test_logic.cpp index 5ddbd8c..08f1af1 100644 --- a/tests/test_logic.cpp +++ b/tests/test_logic.cpp @@ -25,12 +25,11 @@ #include <string> #include <unistd.h> -#include <cchecker/log.h> - #include <logic_.h> #include <app_event_operators.h> #include "client/ocsp-client.h" +#include "common/log.h" using namespace CCHECKER; diff --git a/tests/test_queue.cpp b/tests/test_queue.cpp index 384d6e4..dd1f51e 100644 --- a/tests/test_queue.cpp +++ b/tests/test_queue.cpp @@ -24,10 +24,11 @@ #include <string> #include <thread> -#include <cchecker/log.h> #include <queue_test_thread.h> #include <app_event_operators.h> +#include "common/log.h" + using namespace CCHECKER; BOOST_FIXTURE_TEST_SUITE(QUEUE_TEST, Queue) |