Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Clean up unused references to mimick/mocking in tests #450

Merged
merged 1 commit into from
Feb 5, 2024
Merged

Clean up unused references to mimick/mocking in tests #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ if(BUILD_TESTING)
osrf_testing_tools_cpp::memory_tools LIBRARY_PRELOAD_ENVIRONMENT_IS_AVAILABLE)

ament_add_gtest(test_logging test/test_logging.cpp)
target_link_libraries(test_logging ${PROJECT_NAME} mimick osrf_testing_tools_cpp::memory_tools)
target_link_libraries(test_logging ${PROJECT_NAME} osrf_testing_tools_cpp::memory_tools)

add_executable(test_logging_long_messages test/test_logging_long_messages.cpp)
target_link_libraries(test_logging_long_messages ${PROJECT_NAME})
Expand Down Expand Up @@ -242,7 +242,7 @@ if(BUILD_TESTING)
test/test_char_array.cpp
)
if(TARGET test_char_array)
target_link_libraries(test_char_array ${PROJECT_NAME} mimick)
target_link_libraries(test_char_array ${PROJECT_NAME})
endif()

# Can't use C++ with stdatomic_helper.h
Expand Down Expand Up @@ -283,7 +283,7 @@ if(BUILD_TESTING)
test/test_split.cpp
)
if(TARGET test_split)
target_link_libraries(test_split ${PROJECT_NAME} mimick)
target_link_libraries(test_split ${PROJECT_NAME})
endif()

ament_add_gtest(test_find
Expand Down Expand Up @@ -337,7 +337,7 @@ if(BUILD_TESTING)
test/test_format_string.cpp
)
if(TARGET test_format_string)
target_link_libraries(test_format_string ${PROJECT_NAME} mimick)
target_link_libraries(test_format_string ${PROJECT_NAME})
endif()

ament_add_gtest(test_string_map
Expand Down Expand Up @@ -388,7 +388,7 @@ if(BUILD_TESTING)
# documentation says otherwise, so here we fallback to DT_RPATH entries.
target_link_libraries(test_shared_library_in_run_paths "-Wl,--disable-new-dtags")
endif()
target_link_libraries(test_shared_library_in_run_paths ${PROJECT_NAME} mimick)
target_link_libraries(test_shared_library_in_run_paths ${PROJECT_NAME})
endif()

set(project_binary_dir "$<TARGET_FILE_DIR:${PROJECT_NAME}>")
Expand All @@ -405,7 +405,7 @@ if(BUILD_TESTING)
LIBRARY_OUTPUT_DIRECTORY ${test_libraries_dir})
target_compile_definitions(test_shared_library_in_load_paths PRIVATE
"SHARED_LIBRARY_UNDER_TEST=dummy_shared_library_in_load_paths")
target_link_libraries(test_shared_library_in_load_paths ${PROJECT_NAME} mimick)
target_link_libraries(test_shared_library_in_load_paths ${PROJECT_NAME})
endif()

include(CheckCXXCompilerFlag)
Expand Down Expand Up @@ -438,7 +438,7 @@ if(BUILD_TESTING)
endif()
endif()
target_link_libraries(test_shared_library_preloaded dummy_shared_library_preloaded)
target_link_libraries(test_shared_library_preloaded ${PROJECT_NAME} mimick)
target_link_libraries(test_shared_library_preloaded ${PROJECT_NAME})
endif()

ament_add_gtest(test_time
Expand Down
2 changes: 0 additions & 2 deletions test/test_char_array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#include "rcutils/error_handling.h"
#include "rcutils/types/char_array.h"

#include "./mocking_utils/patch.hpp"

class ArrayCharTest : public ::testing::Test
{
protected:
Expand Down
1 change: 0 additions & 1 deletion test/test_format_string.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <string>

#include "./allocator_testing_utils.h"
#include "./mocking_utils/patch.hpp"

#include "rcutils/allocator.h"
#include "rcutils/format_string.h"
Expand Down
1 change: 0 additions & 1 deletion test/test_shared_library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <string>

#include "./allocator_testing_utils.h"
#include "./mocking_utils/patch.hpp"

#include "rcutils/allocator.h"
#include "rcutils/env.h"
Expand Down