-
Notifications
You must be signed in to change notification settings - Fork 57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Change cmake test file so it is possible to add separate unit test executables #934
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
db31fd0
Change cmake test file so it is possible to add separate unit test e…
maaikez 4be988f
Add extra cmake file to make things a bit more readable.
maaikez b807061
Oops removed something that should be there.
maaikez ddb7331
Review comments
maaikez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,11 @@ | ||
|
|
||
| target_sources(libocpp_unit_tests PRIVATE | ||
| test_database_migration_files.cpp | ||
| test_database_schema_updater.cpp | ||
| test_message_queue.cpp | ||
| test_websocket_uri.cpp | ||
| utils_tests.cpp | ||
| ) | ||
|
|
||
|
|
||
| set(TEST_UTILS_SOURCES ${LIBOCPP_LIB_PATH}/ocpp/common/utils.cpp) | ||
|
|
||
| target_sources(libocpp_utils_tests PRIVATE ${TEST_UTILS_SOURCES}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| set(CONFIG_DIR_V16 "${CMAKE_CURRENT_BINARY_DIR}/resources/v16/") | ||
| set(MIGRATION_FILES_LOCATION_V16 "${CMAKE_CURRENT_BINARY_DIR}/resources/v16/migration_files") | ||
| set(MIGRATION_FILES_LOCATION_V201 "${CMAKE_CURRENT_BINARY_DIR}/resources/v201/migration_files") | ||
| set(CONFIG_FILE_LOCATION_V16 ${CMAKE_CURRENT_SOURCE_DIR}/config/v16/resources/config.json) | ||
| set(USER_CONFIG_FILE_LOCATION_V16 ${CMAKE_CURRENT_SOURCE_DIR}/config/v16/resources/user_config.json) | ||
| set(CONFIG_FILE_RESOURCES_LOCATION_V16 "${CMAKE_CURRENT_BINARY_DIR}/resources/config/v16/config.json") | ||
| set(USER_CONFIG_FILE_RESOURCES_LOCATION_V16 "${CMAKE_CURRENT_BINARY_DIR}/resources/config/v16/user_config.json") | ||
|
|
||
| set(MIGRATION_FILES_DEVICE_MODEL_LOCATION_V201 "${CMAKE_CURRENT_BINARY_DIR}/resources/v201/device_model_migration_files") | ||
| set(DEVICE_MODEL_DB_LOCATION_V201 "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201/device_model_storage.db") | ||
| set(DEVICE_MODEL_RESOURCES_LOCATION_V201 "${CMAKE_CURRENT_BINARY_DIR}/resources/config/v201") | ||
| set(DEVICE_MODEL_RESOURCES_CHANGED_LOCATION_V201 "${CMAKE_CURRENT_BINARY_DIR}/resources/config/v201/changed") | ||
| set(DEVICE_MODEL_RESOURCES_WRONG_LOCATION_V201 "${CMAKE_CURRENT_BINARY_DIR}/resources/config/v201/wrong") | ||
| set(DEVICE_MODEL_CURRENT_RESOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/config/v201/resources) | ||
| set(DEVICE_MODEL_CURRENT_CHANGED_RESOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/config/v201/resources_changed) | ||
| set(DEVICE_MODEL_CURRENT_WRONG_RESOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/config/v201/resources_wrong) | ||
| set(DEVICE_MODEL_EXAMPLE_CONFIG_LOCATION_V201 "${CMAKE_CURRENT_BINARY_DIR}/resources/example_config/v201/component_config") | ||
| set(DEVICE_MODEL_CURRENT_EXAMPLE_CONFIG_LOCATION_V201 "${PROJECT_SOURCE_DIR}/config/v201/component_config") | ||
| set(TEST_PROFILES_LOCATION_V16 "${CMAKE_CURRENT_BINARY_DIR}/resources/profiles/v16") | ||
| set(TEST_PROFILES_LOCATION_V201 "${CMAKE_CURRENT_BINARY_DIR}/resources/profiles/v201") | ||
|
|
||
| # Add variables that can be used for all tests if needed. | ||
| set(GTEST_LIBRARIES GTest::gmock_main GTest::gtest_main) | ||
| set(TEST_COMPILE_OPTIONS -pedantic-errors) | ||
| set(TEST_COMPILE_DEFINITIONS | ||
| CONFIG_FILE_LOCATION_V16="${CONFIG_FILE_RESOURCES_LOCATION_V16}" | ||
| USER_CONFIG_FILE_LOCATION_V16="${USER_CONFIG_FILE_RESOURCES_LOCATION_V16}" | ||
| CONFIG_DIR_V16="${CONFIG_DIR_V16}" | ||
| MIGRATION_FILES_LOCATION_V16="${MIGRATION_FILES_LOCATION_V16}" | ||
| MIGRATION_FILES_LOCATION_V201="${MIGRATION_FILES_LOCATION_V201}" | ||
| MIGRATION_FILE_VERSION_V16=${MIGRATION_FILE_VERSION_V16} | ||
| MIGRATION_FILE_VERSION_V201=${MIGRATION_FILE_VERSION_V201} | ||
| DEVICE_MODEL_DB_LOCATION_V201="${DEVICE_MODEL_DB_LOCATION_V201}" | ||
| TEST_PROFILES_LOCATION_V16="${TEST_PROFILES_LOCATION_V16}" | ||
| TEST_PROFILES_LOCATION_V201="${TEST_PROFILES_LOCATION_V201}") | ||
| set(TEST_COMPILE_FEATURES cxx_std_17) | ||
| set(LIBOCPP_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include) | ||
| set(LIBOCPP_LIB_PATH ${PROJECT_SOURCE_DIR}/lib) | ||
| set(LIBOCPP_3RDPARTY_PATH ${PROJECT_SOURCE_DIR}/3rd_party) | ||
| set(TEST_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/lib/ocpp/common | ||
| ${LIBOCPP_INCLUDE_PATH} | ||
| ) | ||
| # If the test is not linked against the ocpp library, most probably those libraries are needed to link against. | ||
| set(LIBOCPP_TEST_DEFAULT_LINK_LIBRARIES | ||
| SQLite::SQLite3 | ||
| nlohmann_json::nlohmann_json | ||
| date::date-tz | ||
| everest::log | ||
| everest::evse_security | ||
| ) | ||
|
|
||
| # If the test is not linked against the ocpp library, those default sources can be linked against, they will often | ||
| # be needed to link against. | ||
| set(LIBOCPP_TEST_INCLUDE_COMMON_SOURCES ${LIBOCPP_LIB_PATH}/ocpp/common/types.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/ocpp_logging.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/utils.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/call_types.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/evse_security.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/database/database_connection.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/database/database_handler_common.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/database/sqlite_statement.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/common/database/database_schema_updater.cpp | ||
| ) | ||
|
|
||
| # If the test is not linked against the ocpp library, those default sources for ocpp v2.0.1 can be linked against, they | ||
| # will often be needed to link against. | ||
| set(LIBOCPP_TEST_INCLUDE_V201_SOURCES ${LIBOCPP_LIB_PATH}/ocpp/v16/ocpp_enums.cpp # This is currently still needed but might be removed in the future. | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/ctrlr_component_variables.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/types.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/ocpp_types.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/enums.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/ocpp_enums.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/device_model.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/init_device_model_db.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/device_model_storage_sqlite.cpp | ||
| ${LIBOCPP_LIB_PATH}/ocpp/v201/utils.cpp | ||
| ) | ||
|
|
||
| function(add_libocpp_unittest) | ||
| set(oneValueArgs NAME PATH) | ||
| set(options) | ||
| set(multiValueArgs) | ||
| cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) | ||
| if (arg_PATH) | ||
| add_executable(${arg_NAME} ${arg_PATH}) | ||
| else () | ||
| add_executable(${arg_NAME}) | ||
| endif() | ||
| add_test(NAME ${arg_NAME} COMMAND ${arg_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) | ||
| list(APPEND GCOVR_DEPENDENCIES ${arg_NAME}) | ||
| target_link_libraries(${arg_NAME} PUBLIC ${GTEST_LIBRARIES}) | ||
| target_link_libraries(${arg_NAME} PRIVATE ${LIBOCPP_TEST_DEFAULT_LINK_LIBRARIES}) | ||
| target_compile_definitions(${arg_NAME} | ||
| PRIVATE | ||
| ${TEST_COMPILE_DEFINITIONS} | ||
| MIGRATION_FILE_VERSION_V16=${MIGRATION_FILE_VERSION_V16} | ||
| MIGRATION_FILE_VERSION_V201=${MIGRATION_FILE_VERSION_V201} | ||
| MIGRATION_DEVICE_MODEL_FILE_VERSION_V201=${MIGRATION_DEVICE_MODEL_FILE_VERSION_V201}) | ||
| target_compile_options(${arg_NAME} PRIVATE ${TEST_COMPILE_OPTIONS}) | ||
| target_compile_features(${arg_NAME} PUBLIC ${TEST_COMPILE_FEATURES}) | ||
| target_include_directories(${arg_NAME} PRIVATE ${TEST_INCLUDE_DIRECTORIES}) | ||
| message("Add test ${arg_NAME}") | ||
| endfunction() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general we should refactor this a bit to move some of the setup code to functions in a dedicated .cmake, but that doesn't have to happen in this PR