@@ -87,9 +87,24 @@ TEST_F(
8787 EXPECT_EQ (ret, RMW_RET_ERROR) << rmw_get_error_string ().str ;
8888 rmw_reset_error ();
8989
90+ ret = rmw_service_server_is_available (node, nullptr , nullptr );
91+ EXPECT_EQ (ret, RMW_RET_ERROR) << rmw_get_error_string ().str ;
92+ rmw_reset_error ();
93+
9094 ret = rmw_service_server_is_available (node, nullptr , &is_available);
9195 EXPECT_EQ (ret, RMW_RET_ERROR) << rmw_get_error_string ().str ;
9296 rmw_reset_error ();
97+
98+ ret = rmw_service_server_is_available (node, client, nullptr );
99+ EXPECT_EQ (ret, RMW_RET_ERROR) << rmw_get_error_string ().str ;
100+ rmw_reset_error ();
101+
102+ const char * implementation_identifier = client->implementation_identifier ;
103+ client->implementation_identifier = " not-an-rmw-implementation-identifier" ;
104+ ret = rmw_service_server_is_available (node, client, &is_available);
105+ client->implementation_identifier = implementation_identifier;
106+ EXPECT_EQ (ret, RMW_RET_INCORRECT_RMW_IMPLEMENTATION) << rmw_get_error_string ().str ;
107+ rmw_reset_error ();
93108}
94109
95110TEST_F (
@@ -128,26 +143,6 @@ TEST_F(
128143 EXPECT_EQ (RMW_RET_OK, ret) << rmw_get_error_string ().str ;
129144}
130145
131- TEST_F (CLASSNAME(TestServiceServerIsAvailable, RMW_IMPLEMENTATION), rmw_client_destroy_bad_args)
132- {
133- const rosidl_service_type_support_t * ts =
134- ROSIDL_GET_SRV_TYPE_SUPPORT (test_msgs, srv, BasicTypes);
135- rmw_client_t * client_to_destroy = rmw_create_client (
136- node, ts, " /service_name_test" ,
137- &rmw_qos_profile_default);
138- rmw_ret_t ret = rmw_destroy_client (nullptr , client_to_destroy);
139- EXPECT_EQ (RMW_RET_INVALID_ARGUMENT, ret) << rmw_get_error_string ().str ;
140- rmw_reset_error ();
141-
142- ret = rmw_destroy_client (node, nullptr );
143- EXPECT_EQ (RMW_RET_INVALID_ARGUMENT, ret) << rmw_get_error_string ().str ;
144- rmw_reset_error ();
145-
146- ret = rmw_destroy_client (node, client_to_destroy);
147- EXPECT_EQ (RMW_RET_OK, ret) << rmw_get_error_string ().str ;
148- rmw_reset_error ();
149- }
150-
151146TEST_F (CLASSNAME(TestServiceServerIsAvailable, RMW_IMPLEMENTATION), rmw_create_client_fault)
152147{
153148 // Battle test rmw_create_wait_set.
0 commit comments