diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CMakeLists.txt | 63 | ||||
-rw-r--r-- | tests/app_event_operators.h | 4 | ||||
-rw-r--r-- | tests/certs_.h | 2 | ||||
-rw-r--r-- | tests/logic_.h | 2 | ||||
-rw-r--r-- | tests/queue_test_thread.cpp | 4 | ||||
-rw-r--r-- | tests/queue_test_thread.h | 2 | ||||
-rw-r--r-- | tests/stubs_.cpp | 5 | ||||
-rw-r--r-- | tests/test_logic.cpp | 5 |
8 files changed, 44 insertions, 43 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fa2817a..cf924e1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,7 +19,6 @@ FIND_PACKAGE(Threads REQUIRED) ADD_DEFINITIONS( "-DBOOST_TEST_DYN_LINK" ) ADD_DEFINITIONS("-DTEST_APP_SIGNATURES_DIR=\"${TEST_APP_SIGNATURES_DIR}\"") -SET(CERT_CHECKER_SRC_PATH ${PROJECT_SOURCE_DIR}/src) SET(CERT_CHECKER_TESTS_SRC_PATH ${PROJECT_SOURCE_DIR}/tests) SET(CERT_CHECKER_TESTS_SOURCES @@ -35,24 +34,24 @@ SET(CERT_CHECKER_TESTS_SOURCES ${CERT_CHECKER_TESTS_SRC_PATH}/test_certs.cpp ${CERT_CHECKER_TESTS_SRC_PATH}/certs_.cpp # cert-checker - ${CERT_CHECKER_SRC_PATH}/app.cpp - ${CERT_CHECKER_SRC_PATH}/queue.cpp - ${CERT_CHECKER_SRC_PATH}/certs.cpp + ${CERT_CHECKER_SERVICE_PATH}/app.cpp + ${CERT_CHECKER_SERVICE_PATH}/queue.cpp + ${CERT_CHECKER_SERVICE_PATH}/certs.cpp # logs - ${CERT_CHECKER_SRC_PATH}/log/log.cpp + ${CERT_CHECKER_LOG_PATH}/log.cpp # dpl - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/assert.cpp - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/char_traits.cpp - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/colors.cpp - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/errno_string.cpp - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/exception.cpp - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/noncopyable.cpp - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/string.cpp + ${DPL_CORE_SRC_PATH}/assert.cpp + ${DPL_CORE_SRC_PATH}/char_traits.cpp + ${DPL_CORE_SRC_PATH}/colors.cpp + ${DPL_CORE_SRC_PATH}/errno_string.cpp + ${DPL_CORE_SRC_PATH}/exception.cpp + ${DPL_CORE_SRC_PATH}/noncopyable.cpp + ${DPL_CORE_SRC_PATH}/string.cpp # dpl DB - ${CERT_CHECKER_SRC_PATH}/dpl/db/src/sql_connection.cpp - ${CERT_CHECKER_SRC_PATH}/dpl/db/src/naive_synchronization_object.cpp + ${DPL_DB_SRC_PATH}/sql_connection.cpp + ${DPL_DB_SRC_PATH}/naive_synchronization_object.cpp # DB - ${CERT_CHECKER_SRC_PATH}/db/sql_query.cpp + ${CERT_CHECKER_DB_PATH}/sql_query.cpp ) SET(CERT_CHECKER_TESTS_LOGIC_SOURCES @@ -63,31 +62,32 @@ SET(CERT_CHECKER_TESTS_LOGIC_SOURCES ${CERT_CHECKER_TESTS_SRC_PATH}/logic_.cpp ${CERT_CHECKER_TESTS_SRC_PATH}/stubs_.cpp # cert-checker - ${CERT_CHECKER_SRC_PATH}/logic.cpp - ${CERT_CHECKER_SRC_PATH}/app.cpp - ${CERT_CHECKER_SRC_PATH}/queue.cpp + ${CERT_CHECKER_SERVICE_PATH}/logic.cpp + ${CERT_CHECKER_SERVICE_PATH}/app.cpp + ${CERT_CHECKER_SERVICE_PATH}/queue.cpp # logs - ${CERT_CHECKER_SRC_PATH}/log/log.cpp + ${CERT_CHECKER_LOG_PATH}/log.cpp # dpl - ${CERT_CHECKER_SRC_PATH}/dpl/core/src/colors.cpp + ${DPL_CORE_SRC_PATH}/colors.cpp ) SET(CERT_CHECKER_POPUP_TEST_SOURCES # tests ${CERT_CHECKER_TESTS_SRC_PATH}/popup_test.cpp # cert-checker - ${CERT_CHECKER_SRC_PATH}/app.cpp - ${CERT_CHECKER_SRC_PATH}/ui/popup-runner.cpp - ${CERT_CHECKER_SRC_PATH}/ui/UIBackend.cpp + ${CERT_CHECKER_SERVICE_PATH}/app.cpp + ${CERT_CHECKER_UI_PATH}/popup-runner.cpp + ${CERT_CHECKER_UI_PATH}/UIBackend.cpp # logs - ${CERT_CHECKER_SRC_PATH}/log/log.cpp + ${CERT_CHECKER_LOG_PATH}/log.cpp ) INCLUDE_DIRECTORIES(SYSTEM - ${CERT_CHECKER_DEP_INCLUDE_DIRS} + ${CERT_CHECKER_TESTS_DEP_INCLUDE_DIRS} + ${CERT_CHECKER_SRC_PATH}/ ${CERT_CHECKER_SRC_PATH}/include/ - ${CERT_CHECKER_SRC_PATH}/dpl/core/include/ - ${CERT_CHECKER_SRC_PATH}/dpl/db/include/ + ${DPL_CORE_PATH}/include/ + ${DPL_DB_PATH}/include/ ${CERT_CHECKER_TESTS_SRC_PATH}/ ) @@ -96,6 +96,7 @@ ADD_EXECUTABLE(${TARGET_CERT_CHECKER_TESTS_LOGIC} ${CERT_CHECKER_TESTS_LOGIC_SOU ADD_EXECUTABLE(${TARGET_CERT_CHECKER_POPUP_TEST} ${CERT_CHECKER_POPUP_TEST_SOURCES}) TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS} + ${TARGET_CERT_CHECKER_COMMON} ${CERT_CHECKER_TESTS_DEP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} boost_unit_test_framework @@ -103,6 +104,7 @@ TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS} ) TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS_LOGIC} + ${TARGET_CERT_CHECKER_COMMON} ${CERT_CHECKER_TESTS_DEP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} boost_unit_test_framework @@ -110,6 +112,7 @@ TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS_LOGIC} ) TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_POPUP_TEST} + ${TARGET_CERT_CHECKER_COMMON} ${CERT_CHECKER_TESTS_DEP_LIBRARIES} -ldl ) @@ -130,6 +133,6 @@ INSTALL(FILES files/app4/signature1.xml DESTINATION ${TEST_APP_SIGNATURES_DIR}/app4/) -INSTALL(TARGETS ${TARGET_CERT_CHECKER_TESTS} DESTINATION ${BINDIR}) -INSTALL(TARGETS ${TARGET_CERT_CHECKER_TESTS_LOGIC} DESTINATION ${BINDIR}) -INSTALL(TARGETS ${TARGET_CERT_CHECKER_POPUP_TEST} DESTINATION ${BINDIR}) +INSTALL(TARGETS ${TARGET_CERT_CHECKER_TESTS} DESTINATION ${BIN_DIR}) +INSTALL(TARGETS ${TARGET_CERT_CHECKER_TESTS_LOGIC} DESTINATION ${BIN_DIR}) +INSTALL(TARGETS ${TARGET_CERT_CHECKER_POPUP_TEST} DESTINATION ${BIN_DIR}) diff --git a/tests/app_event_operators.h b/tests/app_event_operators.h index 2638c19..a047e56 100644 --- a/tests/app_event_operators.h +++ b/tests/app_event_operators.h @@ -20,8 +20,8 @@ * @brief Implementation of app_test class (from app_t) */ -#include <cchecker/app.h> -#include <cchecker/queue.h> +#include "service/app.h" +#include "service/queue.h" #ifndef CCHECKER_APP_TEST_CLASS_H #define CCHECKER_APP_TEST_CLASS_H diff --git a/tests/certs_.h b/tests/certs_.h index ba1daab..163d299 100644 --- a/tests/certs_.h +++ b/tests/certs_.h @@ -20,7 +20,7 @@ * @brief Implementation of Certs for testing */ -#include <cchecker/certs.h> +#include "service/certs.h" #ifndef CCHECKER_DBFIXTURE_H #define CCHECKER_DBFIXTURE_H diff --git a/tests/logic_.h b/tests/logic_.h index 45ed559..a9317aa 100644 --- a/tests/logic_.h +++ b/tests/logic_.h @@ -28,7 +28,7 @@ * Some of methods are stubbed, and some of them just calls corresponding methods from Logic Class. */ -#include <cchecker/logic.h> +#include "service/logic.h" namespace CCHECKER { diff --git a/tests/queue_test_thread.cpp b/tests/queue_test_thread.cpp index aefc11b..b553dde 100644 --- a/tests/queue_test_thread.cpp +++ b/tests/queue_test_thread.cpp @@ -23,8 +23,8 @@ #include <thread> #include <unistd.h> -#include <cchecker/app.h> -#include <cchecker/queue.h> +#include "service/app.h" +#include "service/queue.h" #include <cchecker/log.h> #include <queue_test_thread.h> diff --git a/tests/queue_test_thread.h b/tests/queue_test_thread.h index c2489d5..2c2989e 100644 --- a/tests/queue_test_thread.h +++ b/tests/queue_test_thread.h @@ -20,7 +20,7 @@ * @brief Implementation of class for multi-thread testing Queue */ -#include <cchecker/queue.h> +#include "service/queue.h" namespace CCHECKER { diff --git a/tests/stubs_.cpp b/tests/stubs_.cpp index c63c668..1360986 100644 --- a/tests/stubs_.cpp +++ b/tests/stubs_.cpp @@ -20,8 +20,9 @@ * @brief Implementation of stubbed functions for testing */ -#include <cchecker/certs.h> -#include <cchecker/queue.h> +#include "service/certs.h" +#include "service/queue.h" + #include <cchecker/sql_query.h> #include <cchecker/UIBackend.h> diff --git a/tests/test_logic.cpp b/tests/test_logic.cpp index 99871fe..e471e99 100644 --- a/tests/test_logic.cpp +++ b/tests/test_logic.cpp @@ -49,12 +49,10 @@ std::string log_apps(std::list<app_t> &apps, std::list<app_t> buff) return ret; } - -} //anonymus +} // anonymous namespace BOOST_FIXTURE_TEST_SUITE(LOGIC_TEST, LogicWrapper) - BOOST_AUTO_TEST_CASE(logic_setup) { BOOST_REQUIRE(setup() == NO_ERROR); @@ -448,5 +446,4 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_APP_REVOKED_2) { buff = get_buffer_(); BOOST_CHECK_MESSAGE(buff == apps, log_apps(apps, buff)); } - BOOST_AUTO_TEST_SUITE_END() |