Skip to content

Commit f52c645

Browse files
committed
Be more verbose in test printouts
1 parent 4588184 commit f52c645

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

test/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ add_executable(ArborX_Test_Clustering.exe
203203
)
204204
target_link_libraries(ArborX_Test_Clustering.exe PRIVATE ArborX Boost::unit_test_framework Boost::dynamic_linking)
205205
target_include_directories(ArborX_Test_Clustering.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/benchmarks/cluster)
206-
add_test(NAME ArborX_Test_Clustering COMMAND ArborX_Test_Clustering.exe)
206+
add_test(NAME ArborX_Test_Clustering COMMAND ArborX_Test_Clustering.exe --log_level=all)
207207

208208
# compare results with a dataset of 1000 points from mlpack
209209
configure_file(
@@ -226,7 +226,7 @@ add_executable(ArborX_Test_DetailsClusteringHelpers.exe
226226
)
227227
target_link_libraries(ArborX_Test_DetailsClusteringHelpers.exe PRIVATE ArborX Boost::unit_test_framework Boost::dynamic_linking)
228228
target_include_directories(ArborX_Test_DetailsClusteringHelpers.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
229-
add_test(NAME ArborX_Test_DetailsClusteringHelpers COMMAND ArborX_Test_DetailsClusteringHelpers.exe)
229+
add_test(NAME ArborX_Test_DetailsClusteringHelpers COMMAND ArborX_Test_DetailsClusteringHelpers.exe --log_level=all)
230230

231231
add_executable(ArborX_Test_SpecializedTraversals.exe
232232
tstDetailsHalfTraversal.cpp

test/tstDBSCAN.cpp

+34-20
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ void dbscan_f()
160160
using ArborX::Details::verifyDBSCAN;
161161
using Point = ArborX::Point<3, Coordinate>;
162162

163+
constexpr bool verbose = true;
164+
163165
ExecutionSpace space;
164166

165167
for (auto impl : {ArborX::DBSCAN::Implementation::FDBSCAN,
@@ -172,23 +174,26 @@ void dbscan_f()
172174

173175
Coordinate r = std::sqrt(3.1);
174176

175-
BOOST_TEST(
176-
verifyDBSCAN(space, points, r - (Coordinate)0.1, 2,
177-
dbscan(space, points, r - (Coordinate)0.1, 2, params)));
177+
BOOST_TEST(verifyDBSCAN(
178+
space, points, r - (Coordinate)0.1, 2,
179+
dbscan(space, points, r - (Coordinate)0.1, 2, params), verbose));
178180
BOOST_TEST(verifyDBSCAN(space, points, r, 2,
179-
dbscan(space, points, r, 2, params)));
181+
dbscan(space, points, r, 2, params), verbose));
180182
BOOST_TEST(verifyDBSCAN(space, points, r, 3,
181-
dbscan(space, points, r, 3, params)));
183+
dbscan(space, points, r, 3, params), verbose));
182184

183185
// Test non-View primitives
184186
HiddenView<decltype(points)> hidden_points{points};
185187
BOOST_TEST(verifyDBSCAN(
186188
space, hidden_points, r - (Coordinate)0.1, 2,
187-
dbscan(space, hidden_points, r - (Coordinate)0.1, 2, params)));
189+
dbscan(space, hidden_points, r - (Coordinate)0.1, 2, params),
190+
verbose));
188191
BOOST_TEST(verifyDBSCAN(space, hidden_points, r, 2,
189-
dbscan(space, hidden_points, r, 2, params)));
192+
dbscan(space, hidden_points, r, 2, params),
193+
verbose));
190194
BOOST_TEST(verifyDBSCAN(space, hidden_points, r, 3,
191-
dbscan(space, hidden_points, r, 3, params)));
195+
dbscan(space, hidden_points, r, 3, params),
196+
verbose));
192197
}
193198

194199
{
@@ -198,25 +203,32 @@ void dbscan_f()
198203
Coordinate r = std::sqrt(3.1);
199204

200205
BOOST_TEST(verifyDBSCAN(space, points, r, 2,
201-
dbscan(space, points, r, 2, params)));
206+
dbscan(space, points, r, 2, params), verbose));
202207
BOOST_TEST(verifyDBSCAN(space, points, r, 3,
203-
dbscan(space, points, r, 3, params)));
208+
dbscan(space, points, r, 3, params), verbose));
204209

205210
BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 2,
206-
dbscan(space, points, 2 * r, 2, params)));
211+
dbscan(space, points, 2 * r, 2, params),
212+
verbose));
207213
BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 3,
208-
dbscan(space, points, 2 * r, 3, params)));
214+
dbscan(space, points, 2 * r, 3, params),
215+
verbose));
209216
BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 4,
210-
dbscan(space, points, 2 * r, 4, params)));
217+
dbscan(space, points, 2 * r, 4, params),
218+
verbose));
211219

212220
BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 2,
213-
dbscan(space, points, 3 * r, 2, params)));
221+
dbscan(space, points, 3 * r, 2, params),
222+
verbose));
214223
BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 3,
215-
dbscan(space, points, 3 * r, 3, params)));
224+
dbscan(space, points, 3 * r, 3, params),
225+
verbose));
216226
BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 4,
217-
dbscan(space, points, 3 * r, 4, params)));
227+
dbscan(space, points, 3 * r, 4, params),
228+
verbose));
218229
BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 5,
219-
dbscan(space, points, 3 * r, 5, params)));
230+
dbscan(space, points, 3 * r, 5, params),
231+
verbose));
220232
}
221233

222234
{
@@ -230,9 +242,11 @@ void dbscan_f()
230242
{{1, -0.5, 0}}});
231243

232244
BOOST_TEST(verifyDBSCAN(space, points, 1.0, 3,
233-
dbscan(space, points, (Coordinate)1, 3, params)));
245+
dbscan(space, points, (Coordinate)1, 3, params),
246+
verbose));
234247
BOOST_TEST(verifyDBSCAN(space, points, 1.0, 4,
235-
dbscan(space, points, (Coordinate)1, 4, params)));
248+
dbscan(space, points, (Coordinate)1, 4, params),
249+
verbose));
236250
}
237251
}
238252

@@ -260,7 +274,7 @@ void dbscan_f()
260274
// This does *not* guarantee to trigger the issue, as it depends on the
261275
// specific implementation and runtime. But it may.
262276
BOOST_TEST(verifyDBSCAN(space, points, (Coordinate)1, 4,
263-
dbscan(space, points, (Coordinate)1, 4)));
277+
dbscan(space, points, (Coordinate)1, 4), verbose));
264278
}
265279
}
266280

0 commit comments

Comments
 (0)