Skip to content

Commit 4d177b2

Browse files
Add timing include (backport #235) (#236)
* Add timing include (#235) * Add timing include Signed-off-by: Pablo Garrido <pablogs9@gmail.com> * Increase ping timeouts in tests Signed-off-by: Pablo Garrido <pablogs9@gmail.com> (cherry picked from commit f2cccfe) * Fix tests Signed-off-by: Pablo Garrido <pablogs9@gmail.com> * Update Signed-off-by: Pablo Garrido <pablogs9@gmail.com> * Uncrustify Signed-off-by: Pablo Garrido <pablogs9@gmail.com> Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
1 parent 083ceee commit 4d177b2

6 files changed

Lines changed: 9 additions & 5 deletions

File tree

rmw_microxrcedds_c/include/rmw_microros/rmw_microros.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <rmw_microros/init_options.h>
2626
#include <rmw_microros/time_sync.h>
2727
#include <rmw_microros/ping.h>
28+
#include <rmw_microros/timing.h>
2829

2930
#if defined(RMW_UXRCE_TRANSPORT_UDP) || defined(RMW_UXRCE_TRANSPORT_TCP)
3031
#include <rmw_microros/discovery.h>

rmw_microxrcedds_c/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ macro(rmw_test TEST_NAME TEST_SOURCE)
2929
rmw_microxrcedds)
3030

3131
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/../src)
32+
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/../test)
3233

3334
target_include_directories(${TEST_NAME}
3435
PUBLIC

rmw_microxrcedds_c/test/test_pubsub.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ class TestPubSub : public ::testing::Test
114114
};
115115
dummy_type_support.callbacks.max_serialized_size =
116116
[]() -> size_t {
117-
return (size_t)(MICROXRCEDDS_PADDING + ucdr_alignment(0, MICROXRCEDDS_PADDING) + 1);
117+
return static_cast<size_t>(MICROXRCEDDS_PADDING +
118+
ucdr_alignment(0, MICROXRCEDDS_PADDING) + 1);
118119
};
119120
}
120121

rmw_microxrcedds_c/test/test_reqres.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ class TestReqRes : public ::testing::Test
133133
};
134134
dummy_type_support.request_members.callbacks.max_serialized_size = []() -> size_t
135135
{
136-
return (size_t)(MICROXRCEDDS_PADDING + ucdr_alignment(0, MICROXRCEDDS_PADDING) + 1);
136+
return static_cast<size_t>(MICROXRCEDDS_PADDING +
137+
ucdr_alignment(0, MICROXRCEDDS_PADDING) + 1);
137138
};
138139

139140
dummy_type_support.response_members.callbacks.cdr_serialize =

rmw_microxrcedds_c/test/test_rmw.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ TEST(rmw_microxrcedds, agent_ping)
6161
ASSERT_EQ(rmw_init_options_init(&test_options, rcutils_get_default_allocator()), RMW_RET_OK);
6262
ASSERT_EQ(rmw_init(&test_options, &test_context), RMW_RET_OK);
6363

64-
ASSERT_EQ(rmw_uros_ping_agent(100, 1), RMW_RET_OK);
64+
ASSERT_EQ(rmw_uros_ping_agent(1000, 1), RMW_RET_OK);
6565

6666
ASSERT_EQ(rmw_init_options_fini(&test_options), RMW_RET_OK);
6767
ASSERT_EQ(rmw_shutdown(&test_context), RMW_RET_OK);
6868

69-
ASSERT_EQ(rmw_uros_ping_agent(100, 1), RMW_RET_OK);
69+
ASSERT_EQ(rmw_uros_ping_agent(1000, 1), RMW_RET_OK);
7070
}
7171

7272
/*

rmw_microxrcedds_c/test/test_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515

16-
#include "./test_utils.hpp"
16+
#include <test_utils.hpp>
1717

1818
#include <string>
1919

0 commit comments

Comments
 (0)