Change test program from test_node_alive to hztest

jsk_rqt_plugins/src/jsk_rqt_plugins/plot_2d.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 import argparse
 import os
 import sys

jsk_rqt_plugins/test/test_rqt_2d_plot.test

@@ -1,22 +1,23 @@
 <launch>
 
-  <include file="$(find jsk_rqt_plugins)/sample/sample_2dplot.launch"/>
+  <node name="rqt_2d_plot"
+        pkg="jsk_rqt_plugins" type="rqt_2d_plot"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_2d_plot"
         name="test_rqt_2d_plot"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /scatter_plot
-      timeout_0: 10
-      node_1: /line_plot
-      timeout_1: 10
-      node_2: /scatter_plot_fit
-      timeout_2: 10
-      node_3: /line_plot_fit
-      timeout_3: 10
-      node_4: /line_plot_fit_ransac
-      timeout_4: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_3d_plot.test

@@ -1,15 +1,23 @@
 <launch>
 
   <node name="rqt_3d_plot"
-        pkg="jsk_rqt_plugins" type="rqt_3d_plot"/>
+        pkg="jsk_rqt_plugins" type="rqt_3d_plot"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_3d_plot"
         name="test_rqt_3d_plot"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /rqt_3d_plot
-      timeout_0: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_drc_mini_maxwell.test

@@ -1,15 +1,23 @@
 <launch>
 
   <node name="rqt_drc_mini_maxwell"
-        pkg="jsk_rqt_plugins" type="rqt_drc_mini_maxwell"/>
+        pkg="jsk_rqt_plugins" type="rqt_drc_mini_maxwell"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_drc_mini_maxwell"
         name="test_rqt_drc_mini_maxwell"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /rqt_drc_mini_maxwell
-      timeout_0: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_histogram_plot.test

@@ -1,16 +1,23 @@
 <launch>
 
-  <include file="$(find jsk_rqt_plugins)/sample/sample_histogram.launch"/>
+  <node name="rqt_histogram_plot"
+        pkg="jsk_rqt_plugins" type="rqt_histogram_plot"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_histogram_plot"
         name="test_rqt_histogram_plot"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /generic_array_plot
-      timeout_0: 10
-      node_1: /histogram_with_range_plot
-      timeout_1: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_image_view2.test

@@ -1,15 +1,23 @@
 <launch>
 
   <node name="rqt_image_view2"
-        pkg="jsk_rqt_plugins" type="rqt_image_view2"/>
+        pkg="jsk_rqt_plugins" type="rqt_image_view2"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_image_view2"
         name="test_rqt_image_view2"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /rqt_image_view2
-      timeout_0: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_service_buttons.test

@@ -1,15 +1,23 @@
 <launch>
 
   <node name="rqt_service_buttons"
-        pkg="jsk_rqt_plugins" type="rqt_service_buttons"/>
+        pkg="jsk_rqt_plugins" type="rqt_service_buttons"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_service_buttons"
         name="test_rqt_service_buttons"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /rqt_service_buttons
-      timeout_0: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_status_light.test

@@ -1,15 +1,23 @@
 <launch>
 
   <node name="rqt_status_light"
-        pkg="jsk_rqt_plugins" type="rqt_status_light"/>
+        pkg="jsk_rqt_plugins" type="rqt_status_light"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_status_light"
         name="test_rqt_status_light"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /rqt_status_light
-      timeout_0: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_string_label.test

@@ -1,15 +1,23 @@
 <launch>
 
   <node name="rqt_string_label"
-        pkg="jsk_rqt_plugins" type="rqt_string_label"/>
+        pkg="jsk_rqt_plugins" type="rqt_string_label"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_string_label"
         name="test_rqt_string_label"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /rqt_string_label
-      timeout_0: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>
 

jsk_rqt_plugins/test/test_rqt_yn_btn.test

@@ -1,15 +1,23 @@
 <launch>
 
   <node name="rqt_yn_btn"
-        pkg="jsk_rqt_plugins" type="rqt_yn_btn"/>
+        pkg="jsk_rqt_plugins" type="rqt_yn_btn"
+        required="true"/>
+
+  <!-- dummy topic publisher -->
+  <node name="string_publisher"
+        pkg="rostopic" type="rostopic"
+        args="pub /chatter std_msgs/String 'data: spam' -r 10"/>
 
   <test test-name="test_rqt_yn_btn"
         name="test_rqt_yn_btn"
-        pkg="jsk_tools" type="test_node_alive.py"
+        pkg="rostest" type="hztest"
         time-limit="10" retry="1">
     <rosparam>
-      node_0: /rqt_yn_btn
-      timeout_0: 10
+      topic: /chatter
+      hz: 10.0
+      hzerror: 10.0
+      test_duration: 1.0
     </rosparam>
   </test>