Skip to content

Commit 491870b

Browse files
committed
Change test include directory: relative -> absolute
Signed-off-by: Mateusz Palczuk <[email protected]>
1 parent e437b44 commit 491870b

17 files changed

+39
-35
lines changed

common/math/geometry/test/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ament_add_gtest(test_polynomial_solver test_polynomial_solver.cpp)
1212
ament_add_gtest(test_transform test_transform.cpp)
1313
ament_add_gtest(test_intersection test_intersection.cpp)
1414
ament_add_gtest(test_line_segment test_line_segment.cpp)
15+
1516
target_link_libraries(test_bounding_box geometry)
1617
target_link_libraries(test_catmull_rom_spline geometry)
1718
target_link_libraries(test_collision geometry)
@@ -24,3 +25,15 @@ target_link_libraries(test_polynomial_solver geometry)
2425
target_link_libraries(test_transform geometry)
2526
target_link_libraries(test_intersection geometry)
2627
target_link_libraries(test_line_segment geometry)
28+
29+
target_include_directories(test_bounding_box PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
30+
target_include_directories(test_catmull_rom_spline PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
31+
target_include_directories(test_collision PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
32+
target_include_directories(test_distance PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
33+
target_include_directories(test_hermite_curve PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
34+
target_include_directories(test_linear_algebra PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
35+
target_include_directories(test_polygon PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
36+
target_include_directories(test_polynomial_solver PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
37+
target_include_directories(test_transform PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
38+
target_include_directories(test_intersection PUBLIC ${CMAKE_SOURCE_DIR}/test/include)
39+
target_include_directories(test_line_segment PUBLIC ${CMAKE_SOURCE_DIR}/test/include)

common/math/geometry/test/test_bounding_box.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
#include <quaternion_operation/quaternion_operation.h>
1717

1818
#include <geometry/bounding_box.hpp>
19+
#include <geometry/test/test_utils.hpp>
1920
#include <scenario_simulator_exception/exception.hpp>
2021

21-
#include "test_utils.hpp"
22-
2322
TEST(BoundingBox, getPointsFromBboxDefault)
2423
{
2524
geometry_msgs::msg::Pose pose;

common/math/geometry/test/test_catmull_rom_spline.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
#include <gtest/gtest.h>
1616

1717
#include <geometry/spline/catmull_rom_spline.hpp>
18+
#include <geometry/test/expect_eq_macros.hpp>
19+
#include <geometry/test/test_utils.hpp>
1820
#include <scenario_simulator_exception/exception.hpp>
1921

20-
#include "expect_eq_macros.hpp"
21-
#include "test_utils.hpp"
22-
2322
constexpr double EPS = 1e-3;
2423

2524
/// @brief Testing the `CatmullRomSpline::getCollisionPointIn2D` function works valid.

common/math/geometry/test/test_collision.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
#include <gtest/gtest.h>
1616

1717
#include <geometry/intersection/collision.hpp>
18+
#include <geometry/test/test_utils.hpp>
1819
#include <scenario_simulator_exception/exception.hpp>
1920

20-
#include "test_utils.hpp"
21-
2221
TEST(Collision, DifferentHeight)
2322
{
2423
geometry_msgs::msg::Pose pose0;

common/math/geometry/test/test_distance.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616

1717
#include <geometry/bounding_box.hpp>
1818
#include <geometry/distance.hpp>
19+
#include <geometry/test/test_utils.hpp>
1920
#include <scenario_simulator_exception/exception.hpp>
2021

21-
#include "test_utils.hpp"
22-
2322
TEST(Distance, PointToPoint)
2423
{
2524
geometry_msgs::msg::Point p00, p01;

common/math/geometry/test/test_hermite_curve.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
#include <gtest/gtest.h>
1616

1717
#include <geometry/spline/hermite_curve.hpp>
18-
19-
#include "expect_eq_macros.hpp"
20-
#include "test_utils.hpp"
18+
#include <geometry/test/expect_eq_macros.hpp>
19+
#include <geometry/test/test_utils.hpp>
2120

2221
constexpr double EPS = 1e-3;
2322

common/math/geometry/test/test_intersection.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
#include <cmath>
1818
#include <geometry/intersection/intersection.hpp>
19-
20-
#include "expect_eq_macros.hpp"
21-
#include "test_utils.hpp"
19+
#include <geometry/test/expect_eq_macros.hpp>
20+
#include <geometry/test/test_utils.hpp>
2221

2322
TEST(Intersection, isIntersect2DDisjoint)
2423
{

common/math/geometry/test/test_line_segment.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717

1818
#include <cmath>
1919
#include <geometry/polygon/line_segment.hpp>
20+
#include <geometry/test/expect_eq_macros.hpp>
21+
#include <geometry/test/test_utils.hpp>
2022
#include <scenario_simulator_exception/exception.hpp>
2123

22-
#include "expect_eq_macros.hpp"
23-
#include "test_utils.hpp"
24-
2524
TEST(LineSegment, initializeDifferentPoints)
2625
{
2726
geometry_msgs::msg::Point point0 = makePoint(0, 0);

common/math/geometry/test/test_linear_algebra.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
#include <gtest/gtest.h>
1616

1717
#include <geometry/linear_algebra.hpp>
18+
#include <geometry/test/expect_eq_macros.hpp>
19+
#include <geometry/test/test_utils.hpp>
1820
#include <limits>
1921

20-
#include "expect_eq_macros.hpp"
21-
#include "test_utils.hpp"
22-
2322
constexpr double EPS = 1e-3;
2423

2524
TEST(LINEAR_ALGEBRA, GET_SIZE_ZERO)

common/math/geometry/test/test_polygon.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
#include <gtest/gtest.h>
1616

1717
#include <geometry/polygon/polygon.hpp>
18+
#include <geometry/test/expect_eq_macros.hpp>
19+
#include <geometry/test/test_utils.hpp>
1820
#include <scenario_simulator_exception/exception.hpp>
1921

20-
#include "expect_eq_macros.hpp"
21-
#include "test_utils.hpp"
22-
2322
TEST(Polygon, filterByAxis)
2423
{
2524
std::vector<geometry_msgs::msg::Point> points{

common/math/geometry/test/test_transform.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
#include <gtest/gtest.h>
1616
#include <quaternion_operation/quaternion_operation.h>
1717

18+
#include <geometry/test/expect_eq_macros.hpp>
19+
#include <geometry/test/test_utils.hpp>
1820
#include <geometry/transform.hpp>
1921

20-
#include "expect_eq_macros.hpp"
21-
#include "test_utils.hpp"
22-
2322
constexpr double EPS = 1e-3;
2423

2524
geometry_msgs::msg::Pose getFilledPose()

common/math/geometry/test/vector3/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ ament_add_gtest(test_truncate
33
test_vector3.cpp
44
test_truncate_msg.cpp
55
test_truncate_custom.cpp)
6+
67
target_link_libraries(test_truncate geometry)
8+
9+
target_include_directories(test_truncate PUBLIC ${CMAKE_SOURCE_DIR}/test/include)

common/math/geometry/test/vector3/test_truncate_custom.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#include <gtest/gtest.h>
1616

1717
#include <cmath>
18+
#include <geometry/test/expect_eq_macros.hpp>
19+
#include <geometry/test/test_utils.hpp>
1820
#include <geometry/vector3/norm.hpp>
1921
#include <geometry/vector3/truncate.hpp>
2022

21-
#include "../expect_eq_macros.hpp"
22-
2323
constexpr double EPS = 1e-6;
2424

2525
/**

common/math/geometry/test/vector3/test_truncate_msg.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
#include <gtest/gtest.h>
1616

1717
#include <cmath>
18+
#include <geometry/test/expect_eq_macros.hpp>
19+
#include <geometry/test/test_utils.hpp>
1820
#include <geometry/vector3/norm.hpp>
1921
#include <geometry/vector3/operator.hpp> // this header is neaded for truncate to work with geometry_msgs::msg::Vector3
2022
#include <geometry/vector3/truncate.hpp>
2123

22-
#include "../expect_eq_macros.hpp"
23-
#include "../test_utils.hpp"
24-
2524
constexpr double EPS = 1e-6;
2625

2726
TEST(Vector3, truncate_msgVectorBelowMax)

common/math/geometry/test/vector3/test_vector3.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
#include <cmath>
1818
#include <geometry/linear_algebra.hpp>
19+
#include <geometry/test/expect_eq_macros.hpp>
20+
#include <geometry/test/test_utils.hpp>
1921
#include <geometry/vector3/hypot.hpp>
2022
#include <geometry/vector3/norm.hpp>
2123
#include <geometry/vector3/normalize.hpp>
2224
#include <geometry/vector3/operator.hpp>
2325

24-
#include "../expect_eq_macros.hpp"
25-
#include "../test_utils.hpp"
26-
2726
constexpr double EPS = 1e-6;
2827

2928
/**

0 commit comments

Comments
 (0)