Skip to content

Commit 8741616

Browse files
committed
Fix unit test and break out magic constants into named values
Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
1 parent 4b39f6c commit 8741616

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

nav2_route/include/nav2_route/utils.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,10 @@ inline visualization_msgs::msg::MarkerArray toMsg(
8282
edges_marker.scale.x = 0.1; // Line width
8383
edges_marker.color.g = 1.0;
8484
edges_marker.color.a = 0.5; // Semi-transparent green so bidirectional connections stand out
85-
// Each edge has 2 points, each node is likely to have at least 2 edges.
86-
// This likely under-reserves but saves some initial reallocations
87-
edges_marker.points.reserve(graph.size() * 2 * 2);
85+
constexpr size_t points_per_edge = 2;
86+
// This probably under-reserves but saves some initial reallocations
87+
constexpr size_t likely_min_edges_per_node = 2;
88+
edges_marker.points.reserve(graph.size() * points_per_edge * likely_min_edges_per_node);
8889

8990
geometry_msgs::msg::Point node_pos;
9091
geometry_msgs::msg::Point edge_start;

nav2_route/test/test_utils_and_types.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,15 @@ TEST(UtilsTest, test_to_visualization_msg_conversion)
159159
graph[3].addEdge(default_cost, &graph[6], ids++);
160160

161161
auto graph_msg = utils::toMsg(graph, frame, time);
162-
EXPECT_EQ(graph_msg.markers.size(), 34u); // 9 nodes and 8 edges (with text markers)
162+
constexpr size_t expected_edge_markers = 1;
163+
constexpr size_t expected_node_markers = 1;
164+
constexpr size_t expected_edge_id_text_markers = 8;
165+
constexpr size_t expected_node_id_text_markers = 9;
166+
constexpr size_t expected_total_markers =
167+
expected_edge_markers + expected_node_markers +
168+
expected_edge_id_text_markers + expected_node_id_text_markers;
169+
170+
EXPECT_EQ(graph_msg.markers.size(), expected_total_markers);
163171
for (auto & marker : graph_msg.markers) {
164172
if (marker.ns == "route_graph_ids") {
165173
EXPECT_EQ(marker.type, visualization_msgs::msg::Marker::TEXT_VIEW_FACING);

0 commit comments

Comments
 (0)