niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Uncoment some test_graph test cases after fix in rmw_fastrtps (ros2/rmw_fastrtps#316) (#498)

Browse source 
* Uncoment some test_graph test cases after fix in rmw_fastrtps

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
This commit is contained in:
ivanpauno 2019-09-12 14:04:32 -07:00 • committed by GitHub
parent e8bbb752df
commit 80407f5f3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

60
rcl/test/rcl/test_graph.cpp
View file

@ -275,7 +275,7 @@ TEST_F(
rcutils_get_zero_initialized_allocator()); rcutils_get_zero_initialized_allocator());
rcl_node_t zero_node = rcl_get_zero_initialized_node(); rcl_node_t zero_node = rcl_get_zero_initialized_node();
const char * unknown_node_name = "/test_rcl_get_publisher_names_and_types_by_node"; const char * unknown_node_name = "/test_rcl_get_publisher_names_and_types_by_node";
// const char * unknown_node_ns = "/test/namespace"; const char * unknown_node_ns = "/test/namespace";
rcl_names_and_types_t nat = rcl_get_zero_initialized_names_and_types(); rcl_names_and_types_t nat = rcl_get_zero_initialized_names_and_types();
// invalid node // invalid node
ret = rcl_get_publisher_names_and_types_by_node( ret = rcl_get_publisher_names_and_types_by_node(
@ -317,11 +317,10 @@ TEST_F(
this->node_ptr, &allocator, false, "_InvalidNodeName", "", &nat); this->node_ptr, &allocator, false, "_InvalidNodeName", "", &nat);
EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
rcl_reset_error(); rcl_reset_error();
// TODO(jacobperron): This succeeds, but should fail due to invalid namespace ret = rcl_get_publisher_names_and_types_by_node(
// ret = rcl_get_publisher_names_and_types_by_node( this->node_ptr, &allocator, false, this->test_graph_node_name, "_!invalidNs", &nat);
// this->node_ptr, &allocator, false, this->test_graph_node_name, "_!invalidNs", &nat); EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
// EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; rcl_reset_error();
// rcl_reset_error();
// invalid names and types // invalid names and types
ret = rcl_get_publisher_names_and_types_by_node( ret = rcl_get_publisher_names_and_types_by_node(
this->node_ptr, &allocator, false, this->test_graph_node_name, "", nullptr); this->node_ptr, &allocator, false, this->test_graph_node_name, "", nullptr);
@ -333,11 +332,10 @@ TEST_F(
EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
rcl_reset_error(); rcl_reset_error();
// unknown node namespace // unknown node namespace
// TODO(jacobperron): This succeeds, but should fail due to invalid namespace ret = rcl_get_publisher_names_and_types_by_node(
// ret = rcl_get_publisher_names_and_types_by_node( this->node_ptr, &allocator, false, this->test_graph_node_name, unknown_node_ns, &nat);
// this->node_ptr, &allocator, false, this->test_graph_node_name, unknown_node_ns, &nat); EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
// EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; rcl_reset_error();
// rcl_reset_error();
// valid call // valid call
ret = rcl_get_publisher_names_and_types_by_node( ret = rcl_get_publisher_names_and_types_by_node(
this->node_ptr, &allocator, false, this->test_graph_node_name, "", &nat); this->node_ptr, &allocator, false, this->test_graph_node_name, "", &nat);
@ -362,7 +360,7 @@ TEST_F(
rcutils_get_zero_initialized_allocator()); rcutils_get_zero_initialized_allocator());
rcl_node_t zero_node = rcl_get_zero_initialized_node(); rcl_node_t zero_node = rcl_get_zero_initialized_node();
const char * unknown_node_name = "/test_rcl_get_subscriber_names_and_types_by_node"; const char * unknown_node_name = "/test_rcl_get_subscriber_names_and_types_by_node";
// const char * unknown_node_ns = "/test/namespace"; const char * unknown_node_ns = "/test/namespace";
rcl_names_and_types_t nat = rcl_get_zero_initialized_names_and_types(); rcl_names_and_types_t nat = rcl_get_zero_initialized_names_and_types();
// invalid node // invalid node
ret = rcl_get_subscriber_names_and_types_by_node( ret = rcl_get_subscriber_names_and_types_by_node(
@ -404,11 +402,10 @@ TEST_F(
this->node_ptr, &allocator, false, "_InvalidNodeName", "", &nat); this->node_ptr, &allocator, false, "_InvalidNodeName", "", &nat);
EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
rcl_reset_error(); rcl_reset_error();
// TODO(jacobperron): This succeeds, but should fail due to invalid namespace ret = rcl_get_subscriber_names_and_types_by_node(
// ret = rcl_get_subscriber_names_and_types_by_node( this->node_ptr, &allocator, false, this->test_graph_node_name, "_!invalidNs", &nat);
// this->node_ptr, &allocator, false, this->test_graph_node_name, "_!invalidNs", &nat); EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
// EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; rcl_reset_error();
// rcl_reset_error();
// invalid names and types // invalid names and types
ret = rcl_get_subscriber_names_and_types_by_node( ret = rcl_get_subscriber_names_and_types_by_node(
this->node_ptr, &allocator, false, this->test_graph_node_name, "", nullptr); this->node_ptr, &allocator, false, this->test_graph_node_name, "", nullptr);
@ -420,11 +417,10 @@ TEST_F(
EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
rcl_reset_error(); rcl_reset_error();
// unknown node namespace // unknown node namespace
// TODO(jacobperron): This succeeds, but should fail due to invalid namespace ret = rcl_get_subscriber_names_and_types_by_node(
// ret = rcl_get_subscriber_names_and_types_by_node( this->node_ptr, &allocator, false, this->test_graph_node_name, unknown_node_ns, &nat);
// this->node_ptr, &allocator, false, this->test_graph_node_name, unknown_node_ns, &nat); EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
// EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; rcl_reset_error();
// rcl_reset_error();
// valid call // valid call
ret = rcl_get_subscriber_names_and_types_by_node( ret = rcl_get_subscriber_names_and_types_by_node(
this->node_ptr, &allocator, false, this->test_graph_node_name, "", &nat); this->node_ptr, &allocator, false, this->test_graph_node_name, "", &nat);
@ -446,7 +442,7 @@ TEST_F(
rcutils_get_zero_initialized_allocator()); rcutils_get_zero_initialized_allocator());
rcl_node_t zero_node = rcl_get_zero_initialized_node(); rcl_node_t zero_node = rcl_get_zero_initialized_node();
const char * unknown_node_name = "/test_rcl_get_service_names_and_types_by_node"; const char * unknown_node_name = "/test_rcl_get_service_names_and_types_by_node";
// const char * unknown_node_ns = "/test/namespace"; const char * unknown_node_ns = "/test/namespace";
rcl_names_and_types_t nat = rcl_get_zero_initialized_names_and_types(); rcl_names_and_types_t nat = rcl_get_zero_initialized_names_and_types();
// invalid node // invalid node
ret = rcl_get_service_names_and_types_by_node( ret = rcl_get_service_names_and_types_by_node(
@ -488,11 +484,10 @@ TEST_F(
this->node_ptr, &allocator, "_InvalidNodeName", "", &nat); this->node_ptr, &allocator, "_InvalidNodeName", "", &nat);
EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
rcl_reset_error(); rcl_reset_error();
// TODO(jacobperron): This succeeds, but should fail due to invalid namespace ret = rcl_get_service_names_and_types_by_node(
// ret = rcl_get_service_names_and_types_by_node( this->node_ptr, &allocator, this->test_graph_node_name, "_!invalidNs", &nat);
// this->node_ptr, &allocator, false, this->test_graph_node_name, "_!invalidNs", &nat); EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
// EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; rcl_reset_error();
// rcl_reset_error();
// invalid names and types // invalid names and types
ret = rcl_get_service_names_and_types_by_node( ret = rcl_get_service_names_and_types_by_node(
this->node_ptr, &allocator, this->test_graph_node_name, "", nullptr); this->node_ptr, &allocator, this->test_graph_node_name, "", nullptr);
@ -504,11 +499,10 @@ TEST_F(
EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
rcl_reset_error(); rcl_reset_error();
// unknown node namespace // unknown node namespace
// TODO(jacobperron): This succeeds, but should fail due to invalid namespace ret = rcl_get_service_names_and_types_by_node(
// ret = rcl_get_service_names_and_types_by_node( this->node_ptr, &allocator, this->test_graph_node_name, unknown_node_ns, &nat);
// this->node_ptr, &allocator, this->test_graph_node_name, unknown_node_ns, &nat); EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str;
// EXPECT_EQ(RCL_RET_ERROR, ret) << rcl_get_error_string().str; rcl_reset_error();
// rcl_reset_error();
// valid call // valid call
ret = rcl_get_service_names_and_types_by_node( ret = rcl_get_service_names_and_types_by_node(
this->node_ptr, &allocator, this->test_graph_node_name, "", &nat); this->node_ptr, &allocator, this->test_graph_node_name, "", &nat);