Finish port of tests

Author: agutenkunst

fiducial_slam/CMakeLists.txt

@@ -111,12 +111,17 @@ if(BUILD_TESTING)
   ament_target_dependencies(auto_init_403_test ${DEPENDENCIES})
   add_ros_test(test/auto_init_403.test.py ARGS "test_binary_dir:=${CMAKE_CURRENT_BINARY_DIR}")
 
-  # init_map_aruco
-  install(FILES test/map_test.py # I guess there is a better way
+
+  install(FILES
+    test/map_test.py # I guess there is a better way
+    test/aruco_transforms.db3 # I guess there is a better way
+    test/111_initial_map.txt # I guess there is a better way
     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test
     PERMISSIONS OWNER_READ OWNER_EXECUTE
   )
   add_ros_test(test/init_map_aruco.test.py ARGS "test_binary_dir:=${CMAKE_CURRENT_BINARY_DIR}/test")
+
+  add_ros_test(test/create_map_aruco.test.py ARGS "test_binary_dir:=${CMAKE_CURRENT_BINARY_DIR}/test")
 endif()
 # if(CATKIN_ENABLE_TESTING)
 #         find_package(catkin REQUIRED COMPONENTS

fiducial_slam/test/610_initial_map.txt

@@ -0,0 +1,101 @@
+import unittest
+
+import launch
+import launch_ros
+import launch_testing
+from pprint import pprint
+from launch.substitutions import LaunchConfiguration, PathJoinSubstitution
+from ament_index_python.packages import get_package_share_directory
+
+import pytest
+
+@pytest.mark.rostest
+def generate_test_description():
+    test_node = launch_ros.actions.Node(
+        executable=PathJoinSubstitution([LaunchConfiguration('test_binary_dir'), 'map_test.py']),
+        output='screen',
+        parameters=[
+            {"min_lines":3},
+            {"expected_pose":"0.73 0.11 1.0 0.98 -0.01 -0.18 0.07"},
+            {"expect": "100 -0.27 0.82 -1.77 -38.17 -0.15 -149.53,\
+                        103 -1.86 -0.59 -1.04 1.70 -23.72 -165.87,\
+                        106 0.22 -0.0 -0.0 -0.9 0.24 0.15,\
+                        107 0.2 -0.28 -0.0 -0.94 1.49 -0.92,\
+                        110 0.7 0.05 0.0 3.38 -4.9 -90,\
+                        111 0.0 0.0 0.0 0.0 0.0 0.0,\
+                        112 0.0 -0.3 0.0 -1.0 0.48 -0.05"}
+        ],
+    )
+
+    rosbag_player = launch.actions.ExecuteProcess(
+            cmd=['ros2', 'bag', 'play', '-l', PathJoinSubstitution([LaunchConfiguration('test_binary_dir'), 'aruco_transforms.db3'])],
+            output='screen'
+    )
+
+    static_tranform_publisher = launch_ros.actions.Node(
+        package='tf2_ros',
+        executable='static_transform_publisher',
+        name='camera_base',
+        arguments="0.0 0.0 0.0 0.0 0.0 0.0 1.0 base_link raspicam".split()
+    )
+
+
+    # aruco_detect = launch_ros.actions.Node(
+    #     package='aruco_detect',
+    #     namespace='aruco_detect',
+    #     executable='aruco_detect',
+    #     name='aruco_detect',
+    #     parameters=[
+    #         {"image_transport":'raw'},
+    #         {"publish_images":True},
+    #         {"fiducial_len":0.145},
+    #     ],
+    #     #Not sure if the remapping is working properly TODO
+    #     remappings=[
+    #         ('camera/compressed', 'camera/image/compressed'),
+    #         ('fiducial_vertices', '/fiducial_vertices'),
+    #         ('fiducial_transforms', '/fiducial_transforms')
+    #     ]
+    # )
+
+    fiducial_slam = launch_ros.actions.Node(
+        package='fiducial_slam',
+        executable='fiducial_slam_node',
+        name='fiducial_slam_node',
+        parameters=[
+            {"map_frame":'map'},
+            {"odom_frame":""},
+            {"base_frame":"base_link"},
+            {"future_date_transforms", "0.0"},
+            {"publish_6dof_pose","true"},
+            {"map_file":"/dev/null"},
+            {"initial_map_file": PathJoinSubstitution([LaunchConfiguration('test_binary_dir'), '111_initial_map.txt'])},
+            {"do_rotation":"true"}
+        ],
+    )
+
+
+    return launch.LaunchDescription([
+        launch.actions.DeclareLaunchArgument(name='test_binary_dir', # From https://github.com/ros-planning/moveit2/blob/1e1337b46daed0aaa1252b87367c1824f46c9b1a/moveit_ros/moveit_servo/test/launch/servo_launch_test_common.py#L92
+                                             description='Binary directory of package containing test executables'),
+        # other fixture actions
+        fiducial_slam,
+        test_node,
+        rosbag_player,
+        static_tranform_publisher,
+        #launch_testing.util.KeepAliveProc(), # From https://github.com/ros2/geometry2/blob/a1be44fdbd8c032351ffd3ddff8467d000f4c6d7/test_tf2/test/buffer_client_tester.launch.py#L39
+        launch_testing.actions.ReadyToTest(),
+    ]), locals()
+
+
+class TestTestTermination(unittest.TestCase):
+    def test_termination(self, test_node, proc_output, proc_info):
+        proc_info.assertWaitForShutdown(process=test_node, timeout=(30))
+
+@launch_testing.post_shutdown_test()
+class TestProcessOutput(unittest.TestCase):
+    def test_no_failed_tests(self, proc_output, proc_info, test_node):
+        # Check that process exits with code -15 code: termination request, sent to the program
+        pprint(proc_info[test_node].returncode)
+        number_of_failed_tests = 0
+        launch_testing.asserts.assertExitCodes(proc_info, [number_of_failed_tests], process=test_node)

fiducial_slam/test/aruco_images.bag

@@ -21,7 +21,7 @@ def generate_test_description():
     )
 
     rosbag_player = launch.actions.ExecuteProcess(
-            cmd=['ros2', 'bag', 'play', '-l', '/home/alex/Projects/PortFiducialsToROS2/ros2_fiducials_ws/src/fiducials/fiducial_slam/test/aruco_transforms.db3'],
+            cmd=['ros2', 'bag', 'play', '-l', PathJoinSubstitution([LaunchConfiguration('test_binary_dir'), 'aruco_transforms.db3'])],
             output='screen'
     )
 

fiducial_slam/test/create_map_aruco.test.py

@@ -77,7 +77,7 @@ def test_map(self):
                         ex = line.split()
                         fid = int(ex[0])
                         ex = ex[1:]
-                        if not self.map.has_key(fid):
+                        if not fid in self.map:
                             self.fail("Fiducial %d not in map" % fid)
                         fiducial = self.map[fid]
                         for i in range(len(ex)):