From 942eed9e5d0d1a6acb674d3f4c93bb6868c03b7d Mon Sep 17 00:00:00 2001 From: JesusSilvaUtrera Date: Wed, 15 May 2024 10:35:17 +0200 Subject: [PATCH] Addressed comments from the PR Signed-off-by: JesusSilvaUtrera --- andino_description/CMakeLists.txt | 2 - andino_description/package.xml | 1 + .../test/test_xacro_processing.py | 38 ++++++++++++++++--- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/andino_description/CMakeLists.txt b/andino_description/CMakeLists.txt index d7609aa5..0eacb21b 100644 --- a/andino_description/CMakeLists.txt +++ b/andino_description/CMakeLists.txt @@ -30,6 +30,4 @@ if(BUILD_TESTING) endforeach() endif() -# ament_python_install_package(${PROJECT_NAME}) - ament_package() diff --git a/andino_description/package.xml b/andino_description/package.xml index c702c25b..20d4cac2 100644 --- a/andino_description/package.xml +++ b/andino_description/package.xml @@ -18,6 +18,7 @@ xacro ament_cmake_pytest + ament_index_python ament_cmake diff --git a/andino_description/test/test_xacro_processing.py b/andino_description/test/test_xacro_processing.py index 578c7c7a..09f7ba12 100644 --- a/andino_description/test/test_xacro_processing.py +++ b/andino_description/test/test_xacro_processing.py @@ -1,15 +1,43 @@ +# BSD 3-Clause License + +# Copyright (c) 2024, Ekumen Inc. +# All rights reserved. + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: + +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. + +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. + +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. + +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + import os import pytest import xacro from ament_index_python.packages import get_package_share_directory -andino_description_pkg = get_package_share_directory("andino_description") - def test_xacro_processing(): - # Get the file path - xacro_file_path = os.path.join(andino_description_pkg, 'urdf', 'andino.urdf.xacro') + # Get the file path. + xacro_file_path = os.path.join(get_package_share_directory("andino_description"), 'urdf', 'andino.urdf.xacro') - # Test xacro processing + # Test xacro processing. try: xacro.process_file(xacro_file_path) except Exception as e: