[test] Cleaner namespace assignment.

wg-perception · Feb 15, 2017 · ecc3dfc · ecc3dfc
1 parent ea4af2d
commit ecc3dfc
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/face_detector/test/common_rtest.xml b/face_detector/test/common_rtest.xml
@@ -1,17 +1,19 @@
 <launch>
   <arg name="expected_success" default="true" />
+  <arg name="testnode_name" default="hztest1" />
 
-  <group unless="$(arg expected_success)">
-    <node pkg="rosbag" type="play" name="play" args="-r 0.5 $(find face_detector)/test/face_detector_noface_test_diamondback.bag"/>
-    <param name="hztest1/hz" value="0.0" />
-  </group>
-  <group if="$(arg expected_success)">
-    <node pkg="rosbag" type="play" name="play" args="-r 0.5 $(find face_detector)/test/face_detector_withface_test_diamondback.bag"/>
-    <param name="hztest1/hz" value="30.0" />
-    <param name="hztest1/hzerror" value="29.9" />
-  </group>
+  <test test-name="hztest_test" pkg="rostest" type="hztest" name="$(arg testnode_name)">
+    <group unless="$(arg expected_success)">
+      <node pkg="rosbag" type="play" name="play" args="-r 0.5 $(find face_detector)/test/face_detector_noface_test_diamondback.bag"/>
+      <param name="hz" value="0.0" />
+    </group>
+    <group if="$(arg expected_success)">
+      <node pkg="rosbag" type="play" name="play" args="-r 0.5 $(find face_detector)/test/face_detector_withface_test_diamondback.bag"/>
+      <param name="hz" value="30.0" />
+      <param name="hzerror" value="29.9" />
+    </group>
 
-  <param name="hztest1/topic" value="face_detector/people_tracker_measurements_array" />
-  <param name="hztest1/test_duration" value="15.0" />
-  <test test-name="hztest_test" pkg="rostest" type="hztest" name="hztest1" />
+    <param name="topic" value="face_detector/people_tracker_measurements_array" />
+    <param name="test_duration" value="15.0" />
+  </test>
 </launch>