Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
dr_param
roscpp
roslib
rospack
tf
)

Expand Down
7 changes: 3 additions & 4 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
<version>0.1.3</version>
<description>Delft Robotics ROS utility.</description>
<license>Apache 2.0</license>

<maintainer email="maarten@de-vri.es">Maarten de Vries</maintainer>
<maintainer email="info@fizyr.com">Fizyr Team</maintainer>
<author email="maarten@de-vri.es">Maarten de Vries</author>

<buildtool_depend>catkin</buildtool_depend>
<depend>dr_log</depend>
<depend>dr_param</depend>
<depend>dr_util</depend>
<depend>roscpp</depend>
<depend>roslib</depend>
<depend>rospack</depend>
<depend>tf</depend>

<test_depend>catch2</test_depend>
</package>
12 changes: 12 additions & 0 deletions src/resource.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
// This repository
#include "resource.hpp"

// ROS
#include <ros/package.h>

// C++
#include <algorithm>
#include <stdexcept>
#include <iostream>
#include <cstdio>
#include <iostream>
#include <memory>
#include <stdexcept>
#include <string>
#include <array>
#include <vector>
#include <map>

namespace dr {

Expand Down
14 changes: 14 additions & 0 deletions test/resource.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
// This repository
#include "resource.hpp"

// ROS
#include <ros/package.h>

// Catch2
#include <catch2/catch.hpp>

namespace dr {

TEST_CASE("ResourceTest -- packageUrl", "packageUrl") {
/**
* TODO: This test fails in BuildBot because it can not resolve the location
* of the "package://some_package". At the end of a chain of calls,
* 'ROSPack::run(..)' excecutes "rospack find some_package".
*
* More about this method.
* http://docs.ros.org/indigo/api/rospack/html/rospack__backcompat_8cpp_source.html *
*
* This method succeeds if rospack is installed and located in the PATH.
* In BuildBot test-container rospack is installed, but its location is not in the PATH.
**/
REQUIRE(ros::package::getPath("dr_ros") + "/test.file" == resolveResourceUrl("package://dr_ros/test.file"));
}

Expand Down