From bcf4f17fe75d7f1fa03cedf1a9ee5e71228c437f Mon Sep 17 00:00:00 2001
From: "Isaac I.Y. Saito" <130s@2000.jukuin.keio.ac.jp>
Date: Sat, 15 Oct 2016 11:17:34 +0900
Subject: [PATCH] [test] Cleaner namespace assignment.

---
 face_detector/test/common_rtest.xml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/face_detector/test/common_rtest.xml b/face_detector/test/common_rtest.xml
index 3ed73c07..597b5004 100644
--- 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>