Merge pull request #53 from micro-ROS/bugfix/removed-seq-id-checks-in…

…-unit-tests removed checks for sequence id
ros2 · Feb 23, 2021 · 1b8d45a · 1b8d45a
2 parents 1bfad12 + ddd6a96
commit 1b8d45a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/rclc/test/rclc/test_client.cpp b/rclc/test/rclc/test_client.cpp
@@ -50,7 +50,6 @@ TEST(Test, rclc_client_init_default) {
   // Check that there were no errors while sending the request.
   int64_t sequence_number = 0;
   rc = rcl_send_request(&client, &req, &sequence_number);
-  // EXPECT_EQ(sequence_number, 1);
   EXPECT_EQ(RCL_RET_OK, rc) << rcl_get_error_string().str;
   test_msgs__srv__BasicTypes_Request__fini(&req);
 
@@ -110,7 +109,6 @@ TEST(Test, rclc_client_init_best_effort) {
   // Check that there were no errors while sending the request.
   int64_t sequence_number = 0;
   rc = rcl_send_request(&client, &req, &sequence_number);
-  // EXPECT_EQ(sequence_number, 1);
   EXPECT_EQ(RCL_RET_OK, rc) << rcl_get_error_string().str;
   test_msgs__srv__BasicTypes_Request__fini(&req);
 

diff --git a/rclc/test/rclc/test_executor.cpp b/rclc/test/rclc/test_executor.cpp
@@ -1878,7 +1878,6 @@ TEST_F(TestDefaultExecutor, executor_test_service) {
   cli_req.b = 2;
   rc = rcl_send_request(&client, &cli_req, &seq);
   EXPECT_EQ(RCL_RET_OK, rc) << rcl_get_error_string().str;
-  // EXPECT_EQ(seq, (int64_t) 1);  // sequence id = 1
 
   // initialize test results
   _results_initialize_service_client();
@@ -1977,7 +1976,6 @@ TEST_F(TestDefaultExecutor, executor_test_service_with_reqid) {
   cli_req.b = 2;
   rc = rcl_send_request(&client, &cli_req, &seq);
   EXPECT_EQ(RCL_RET_OK, rc) << rcl_get_error_string().str;
-  // EXPECT_EQ(seq, (int64_t) 1);  // sequence id = 1
 
   // initialize test results
   _results_initialize_service_client();
@@ -1994,7 +1992,6 @@ TEST_F(TestDefaultExecutor, executor_test_service_with_reqid) {
 
   EXPECT_EQ(srv1_cnt, (unsigned int) 1);  // check that service callback was called
   EXPECT_EQ(srv1_value, (unsigned int) 1);  // check value of 'a' in request message
-  // EXPECT_EQ(srv1_id, (unsigned int) 1);  // check sequence id
 
   // spin executor, which will
   // - receive response message from server
@@ -2081,7 +2078,6 @@ TEST_F(TestDefaultExecutor, executor_test_service_with_context) {
   cli_req.b = 2;
   rc = rcl_send_request(&client, &cli_req, &seq);
   EXPECT_EQ(RCL_RET_OK, rc) << rcl_get_error_string().str;
-  // EXPECT_EQ(seq, (int64_t) 1);  // sequence id = 1
 
   // initialize test results
   _results_initialize_service_client();
@@ -2098,7 +2094,7 @@ TEST_F(TestDefaultExecutor, executor_test_service_with_context) {
 
   EXPECT_EQ(srv1_cnt, (unsigned int) 1);  // check that service callback was called
   EXPECT_EQ(srv1_value, (unsigned int) 1);  // check value of 'a' in request message
-  EXPECT_EQ(srv1_ctxt, (unsigned int) 42);  // check sequence id
+  EXPECT_EQ(srv1_ctxt, (unsigned int) 42);  // check context value
 
   // spin executor, which will
   // - receive response message from server