fix tests

Author: Ioan Sucan

CMakeLists.txt

@@ -65,9 +65,7 @@ target_link_libraries(${PROJECT_NAME} ${ASSIMP_LIBRARIES} ${QHULL_LIBRARIES} ${c
 
 
 # Unit tests
-catkin_add_gtest(test_point_inclusion test/test_point_inclusion.cpp)
-target_link_libraries(test_point_inclusion ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-
+add_subdirectory(test)
 
 install(TARGETS ${PROJECT_NAME}
         ARCHIVE DESTINATION lib

test/CMakeLists.txt

@@ -0,0 +1,9 @@
+file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/resources" TEST_RESOURCES_DIR)
+if(WIN32)
+    # Correct directory separator for Windows
+    string(REPLACE "\\" "\\\\" TEST_RESOURCES_DIR "${TEST_RESOURCES_DIR}")
+endif(WIN32)
+configure_file("${TEST_RESOURCES_DIR}/config.h.in" "${TEST_RESOURCES_DIR}/config.h")
+include_directories(.)
+catkin_add_gtest(test_point_inclusion test_point_inclusion.cpp)
+target_link_libraries(test_point_inclusion ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

test/resources/config.h.in

@@ -0,0 +1,5 @@
+#ifndef GEOMETRIC_SHAPES_TEST_RESOURCES_CONFIG_
+#define GEOMETRIC_SHAPES_TEST_RESOURCES_CONFIG_
+
+#define TEST_RESOURCES_DIR "@TEST_RESOURCES_DIR@"
+#endif

test/test_point_inclusion.cpp

@@ -39,7 +39,7 @@
 #include <geometric_shapes/body_operations.h>
 #include <boost/filesystem.hpp>
 #include <gtest/gtest.h>
-
+#include "resources/config.h"
 
 TEST(SpherePointContainment, SimpleInside)
 {
@@ -259,7 +259,7 @@ TEST(CylinderPointContainment, CylinderPadding)
 
 TEST(MeshPointContainment, Pr2Forearm)
 {
-    shapes::Mesh *ms = shapes::createMeshFromResource("file://" + (boost::filesystem::current_path() / "test/resources/forearm_roll.stl").string());
+    shapes::Mesh *ms = shapes::createMeshFromResource("file://" + (boost::filesystem::path(TEST_RESOURCES_DIR) / "/forearm_roll.stl").string());
     EXPECT_EQ(ms->vertex_count, 2338);
     bodies::Body *m = new bodies::ConvexMesh(ms);
     Eigen::Affine3d t(Eigen::Affine3d::Identity());