use rcl_interfaces for service testing

Author: wjwwood

rclpy/package.xml

@@ -21,9 +21,9 @@
   <test_depend>ament_cmake_nose</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
+  <test_depend>rcl_interfaces</test_depend>
   <test_depend>rosidl_generator_py</test_depend>
   <test_depend>std_msgs</test_depend>
-  <test_depend>std_srvs</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

rclpy/test/test_node.py

@@ -20,7 +20,7 @@
 from rclpy.exceptions import InvalidTopicNameException
 
 from std_msgs.msg import String
-from std_srvs.srv import Empty
+from rcl_interfaces.srv import GetParameters
 
 
 class TestNode(unittest.TestCase):
@@ -61,22 +61,22 @@ def test_create_subscription(self):
             self.node.create_subscription(String, 'foo/{bad_sub}', lambda msg: print(msg))
 
     def test_create_client(self):
-        self.node.create_client(Empty, 'side/effect')
+        self.node.create_client(GetParameters, 'get/parameters')
         with self.assertRaisesRegex(InvalidServiceNameException, 'must not contain characters'):
-            self.node.create_client(Empty, 'side/effect?')
+            self.node.create_client(GetParameters, 'get/parameters?')
         with self.assertRaisesRegex(InvalidServiceNameException, 'must not start with a number'):
-            self.node.create_client(Empty, '/side/42effect')
+            self.node.create_client(GetParameters, '/get/42parameters')
         with self.assertRaisesRegex(ValueError, 'unknown substitution'):
-            self.node.create_client(Empty, 'foo/{bad_sub}')
+            self.node.create_client(GetParameters, 'foo/{bad_sub}')
 
     def test_create_service(self):
-        self.node.create_service(Empty, 'side/effect', lambda req: None)
+        self.node.create_service(GetParameters, 'get/parameters', lambda req: None)
         with self.assertRaisesRegex(InvalidServiceNameException, 'must not contain characters'):
-            self.node.create_service(Empty, 'side/effect?', lambda req: None)
+            self.node.create_service(GetParameters, 'get/parameters?', lambda req: None)
         with self.assertRaisesRegex(InvalidServiceNameException, 'must not start with a number'):
-            self.node.create_service(Empty, '/side/42effect', lambda req: None)
+            self.node.create_service(GetParameters, '/get/42parameters', lambda req: None)
         with self.assertRaisesRegex(ValueError, 'unknown substitution'):
-            self.node.create_service(Empty, 'foo/{bad_sub}', lambda req: None)
+            self.node.create_service(GetParameters, 'foo/{bad_sub}', lambda req: None)
 
 
 if __name__ == '__main__':