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

Add fault injection macro unit tests #27

Merged
merged 3 commits into from
Aug 26, 2020
Merged

Add fault injection macro unit tests #27

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a70107
Add fault injection macro unit tests
brawner Jul 28, 2020
5d490c1
target definitions
brawner Aug 7, 2020
7143397
PR Fixup
brawner Aug 25, 2020
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
1 change: 1 addition & 0 deletions rmw_dds_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ if(BUILD_TESTING)
ament_add_gmock(test_graph_cache test/test_graph_cache.cpp)
if(TARGET test_graph_cache)
target_link_libraries(test_graph_cache ${PROJECT_NAME}_library osrf_testing_tools_cpp::memory_tools)
target_compile_definitions(test_graph_cache PUBLIC RCUTILS_ENABLE_FAULT_INJECTION)
endif()

ament_add_gmock(test_gid_utils test/test_gid_utils.cpp)
Expand Down
62 changes: 62 additions & 0 deletions rmw_dds_common/test/test_graph_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include "osrf_testing_tools_cpp/scope_exit.hpp"

#include "rcutils/testing/fault_injection.h"
#include "rmw/qos_profiles.h"
#include "rmw/topic_endpoint_info.h"
#include "rmw/topic_endpoint_info_array.h"
Expand Down Expand Up @@ -1550,3 +1551,64 @@ TEST(test_graph_cache, bad_arguments)
rcutils_reset_error();
}
}

TEST(test_graph_cache, get_writers_info_by_topic_maybe_fail)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brawner would it make sense to split this test case into three separate ones (i.e. one for each method being fault injected).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, done! I think I originally intended for that given the test name.

{
RCUTILS_FAULT_INJECTION_TEST(
{
GraphCache graph_cache;
add_participants(graph_cache, {"participant1"});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this init section be left out of the fault_injection test macro?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so. I created a test fixture class and split this test into three separate TEST_Fs

add_entities(
graph_cache,
{
// topic1
{"reader1", "participant1", "topic1", "Str", true},
{"writer1", "participant1", "topic1", "Str", false},
});
add_nodes(
graph_cache, {
{"participant1", "ns1", "node1"},
{"participant1", "ns1", "node2"},
{"participant1", "ns2", "node1"}});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brawner perhaps not an issue, but should the test fixture be setup outside the fault injection loop?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yah, created a test fixture class.


rmw_topic_endpoint_info_array_t info = rmw_get_zero_initialized_topic_endpoint_info_array();

rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_ret_t ret = graph_cache.get_writers_info_by_topic(
"topic1",
identity_demangle,
&allocator,
&info);
if (RMW_RET_OK == ret) {
ret = rmw_topic_endpoint_info_array_fini(&info, &allocator);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brawner should this be:

Suggested change
ret = rmw_topic_endpoint_info_array_fini(&info, &allocator);
EXPECT_EQ(RWM_RET_OK, rmw_topic_endpoint_info_array_fini(&info, &allocator));

instead? Also, what if fault injection occurs here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, it will fail during a fault injection test because there will be at least one hook in there. I added a check on the return of fini just in case it needs be done a second time.

} else {
rcutils_reset_error();
}

rcutils_string_array_t names = rcutils_get_zero_initialized_string_array();
rcutils_string_array_t namespaces = rcutils_get_zero_initialized_string_array();
rcutils_string_array_t enclaves = rcutils_get_zero_initialized_string_array();
ret = graph_cache.get_node_names(&names, &namespaces, &enclaves, &allocator);
if (RMW_RET_OK == ret) {
ret = rcutils_string_array_fini(&names);
ret = rcutils_string_array_fini(&namespaces);
ret = rcutils_string_array_fini(&enclaves);
} else {
rcutils_reset_error();
}

DemangleFunctionT demangle_topic = identity_demangle;
DemangleFunctionT demangle_type = identity_demangle;
rmw_names_and_types_t names_and_types = rmw_get_zero_initialized_names_and_types();
ret = graph_cache.get_names_and_types(
demangle_topic,
demangle_type,
&allocator,
&names_and_types);
if (RMW_RET_OK == ret) {
ret = rmw_names_and_types_fini(&names_and_types);
} else {
rcutils_reset_error();
}
});
}