adjust testing tool naming

tecnalia-advancedmanufacturing-robotics · Nov 11, 2020 · d17dc97 · d17dc97
1 parent 537501d
commit d17dc97
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 13 deletions.
diff --git a/.rosinstall b/.rosinstall
@@ -1,4 +1,4 @@
 - git:
-    local-name: 'ros_node_test'
-    uri: 'https://github.com/tecnalia-advancedmanufacturing-robotics/ros_node_test.git'
-    version: 'master'
+    local-name: 'rostest_node_interface_validation'
+    uri: 'https://github.com/tecnalia-advancedmanufacturing-robotics/rostest_node_interface_validation.git'
+    version: 'melodic-devel'
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ To do so the input needed are:
 * A _package template_: a template is created by a _template Designer_.
   It contains the list of files to be automatically generated.
   The _Developer_ just has to select the template that best fits his needs.
-* An _interface specification_: a xml file describing mainly the interface of the package to create, according to the template.
+* An _interface specification_: a XML file describing mainly the interface of the package to create, according to the template.
   This file is to be filled by the _Developer_, using the interface proposed by the template, according to the concrete needs of the package he is willing to create
 
 **Author & Maintainer**: Anthony Remazeilles, [email protected]
@@ -74,9 +74,11 @@ rosdep update
 rosdep install --from-paths src --ignore-src --rosdistro $ROS_DISTRO
 ```
 
-The testing functionalities generated by the template rely on [rostest](http://wiki.ros.org/rostest) and [node_test](https://github.com/tecnalia-advancedmanufacturing-robotics/ros_node_test).
+The testing functionalities generated by the template rely on
+[rostest](http://wiki.ros.org/rostest) and
+[rostest_node_interface_validation](https://github.com/tecnalia-advancedmanufacturing-robotics/rostest_node_interface_validation/).
 The first package can be installed as any regular ROS package.
-The second is not in the buildfarm yet, and has to be cloned in your workspace.
+The second is not in the build-farm yet, and has to be cloned in your workspace.
 A [.rosinstall](.rosinstall) file is added for your convenience.
 [wstool](http://wiki.ros.org/wstool) can be used to add it to the workspace.
 

diff --git a/...e_generator_templates/templates/cpp_node_update/template/test/test_component_service.test b/...e_generator_templates/templates/cpp_node_update/template/test/test_component_service.test
@@ -4,7 +4,9 @@
 {forallserviceServer}
     <!-- protected region {componentName} {name} additional configuration begin -->
     <!-- protected region {componentName} {name} additional configuration end -->
-    <test test-name="service_test_{componentName}_{name}" pkg="node_test" type="test_service" name="service_test_{componentName}_{name}">
+    <test test-name="service_test_{componentName}_{name}"
+        pkg="rostest_node_interface_validation" type="test_service"
+        name="service_test_{componentName}_{name}">
         <rosparam>
             calls:
                 - name: /{name}

diff --git a/...enerator_templates/templates/cpp_service_server/template/test/test_component_service.test b/...enerator_templates/templates/cpp_service_server/template/test/test_component_service.test
@@ -4,7 +4,9 @@
 {forallserviceServer}
     <!-- protected region {componentName} {name} additional configuration begin -->
     <!-- protected region {componentName} {name} additional configuration end -->
-    <test test-name="service_test_{componentName}_{name}" pkg="node_test" type="test_service" name="service_test_{componentName}_{name}">
+    <test test-name="service_test_{componentName}_{name}"
+        pkg="rostest_node_interface_validation" type="test_service"
+        name="service_test_{componentName}_{name}">
         <rosparam>
             calls:
                 - name: /{name}

diff --git a/package_generator_templates/templates/nodetest/config/functions.py b/package_generator_templates/templates/nodetest/config/functions.py
@@ -53,6 +53,6 @@ def dependencies_from_interface(interface_name, context):
     list_dep = []
 
     if interface_name in ['service', 'filter']:
-        list_dep.append('node_test')
+        list_dep.append('rostest_node_interface_validation')
     return list_dep
 
diff --git a/package_generator_templates/templates/nodetest/template/test/component_filter.test b/package_generator_templates/templates/nodetest/template/test/component_filter.test
@@ -4,7 +4,9 @@
 {forallfilter}
     <!-- protected region {componentName} {name} additional configuration begin -->
     <!-- protected region {componentName} {name} additional configuration end -->
-    <test test-name="filter_test_{apply-get_name_no_py}_{topic_out}" pkg="node_test" type="test_filter" name="filter_test_{apply-get_name_no_py}_{topic_out}">
+    <test test-name="filter_test_{apply-get_name_no_py}_{topic_out}"
+        pkg="rostest_node_interface_validation" type="test_filter"
+        name="filter_test_{apply-get_name_no_py}_{topic_out}">
         <rosparam>
             filters:
                 - topic_in: /{topic_in}

diff --git a/package_generator_templates/templates/nodetest/template/test/component_service.test b/package_generator_templates/templates/nodetest/template/test/component_service.test
@@ -4,7 +4,9 @@
 {forallservice}
     <!-- protected region {componentName} {name} additional configuration begin -->
     <!-- protected region {componentName} {name} additional configuration end -->
-    <test test-name="service_test_{componentName}_{name}" pkg="node_test" type="test_service" name="service_test_{componentName}_{name}">
+    <test test-name="service_test_{componentName}_{name}"
+        pkg="rostest_node_interface_validation" type="test_service"
+        name="service_test_{componentName}_{name}">
         <rosparam>
             calls:
                 - name: /{name}

diff --git a/...enerator_templates/templates/python_node_update/template/test/test_component_service.test b/...enerator_templates/templates/python_node_update/template/test/test_component_service.test
@@ -4,7 +4,9 @@
 {forallserviceServer}
     <!-- protected region {componentName} {name} additional configuration begin -->
     <!-- protected region {componentName} {name} additional configuration end -->
-    <test test-name="service_test_{componentName}_{name}" pkg="node_test" type="test_service" name="service_test_{componentName}_{name}">
+    <test test-name="service_test_{componentName}_{name}"
+        pkg="rostest_node_interface_validation" type="test_service"
+        name="service_test_{componentName}_{name}">
         <rosparam>
             calls:
                 - name: /{name}

diff --git a/...rator_templates/templates/python_service_server/template/test/test_component_service.test b/...rator_templates/templates/python_service_server/template/test/test_component_service.test
@@ -4,7 +4,9 @@
 {forallserviceServer}
     <!-- protected region {componentName} {name} additional configuration begin -->
     <!-- protected region {componentName} {name} additional configuration end -->
-    <test test-name="service_test_{componentName}_{name}" pkg="node_test" type="test_service" name="service_test_{componentName}_{name}">
+    <test test-name="service_test_{componentName}_{name}"
+        pkg="rostest_node_interface_validation" type="test_service"
+        name="service_test_{componentName}_{name}">
         <rosparam>
             calls:
                 - name: /{name}