Skip to content

Commit c9eb325

Browse files
scpetersscpeters
committed
Use GTEST_SKIP in unsupported tests
Signed-off-by: Steve Peters <scpeters@intrinsic.ai>
1 parent 50e14bd commit c9eb325

11 files changed

+32
-64
lines changed

‎test/integration/boundingbox_camera.cc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,18 +216,16 @@ void BoundingBoxCameraSensorTest::BoxesWithBuiltinSDF(
216216
// Skip unsupported engines
217217
if (_renderEngine != "ogre2")
218218
{
219-
gzdbg << "Engine '" << _renderEngine
219+
GTEST_SKIP() << "Engine '" << _renderEngine
220220
<< "' doesn't support bounding box cameras" << std::endl;
221-
return;
222221
}
223222

224223
// Setup gz-rendering with an empty scene
225224
auto *engine = rendering::engine(_renderEngine);
226225
if (!engine)
227226
{
228-
gzdbg << "Engine '" << _renderEngine
227+
GTEST_SKIP() << "Engine '" << _renderEngine
229228
<< "' is not supported" << std::endl;
230-
return;
231229
}
232230

233231
rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -385,18 +383,16 @@ void BoundingBoxCameraSensorTest::Boxes3DWithBuiltinSDF(
385383
// Skip unsupported engines
386384
if (_renderEngine != "ogre2")
387385
{
388-
gzdbg << "Engine '" << _renderEngine
386+
GTEST_SKIP() << "Engine '" << _renderEngine
389387
<< "' doesn't support bounding box cameras" << std::endl;
390-
return;
391388
}
392389

393390
// Setup gz-rendering with an empty scene
394391
auto *engine = rendering::engine(_renderEngine);
395392
if (!engine)
396393
{
397-
gzdbg << "Engine '" << _renderEngine
394+
GTEST_SKIP() << "Engine '" << _renderEngine
398395
<< "' is not supported" << std::endl;
399-
return;
400396
}
401397

402398
rendering::ScenePtr scene = engine->CreateScene("scene");

‎test/integration/camera.cc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ void CameraSensorTest::ImagesWithBuiltinSDF(const std::string &_renderEngine)
116116
auto *engine = gz::rendering::engine(_renderEngine);
117117
if (!engine)
118118
{
119-
gzdbg << "Engine '" << _renderEngine
119+
GTEST_SKIP() << "Engine '" << _renderEngine
120120
<< "' is not supported" << std::endl;
121-
return;
122121
}
123122

124123
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -218,9 +217,8 @@ void CameraSensorTest::CameraIntrinsics(const std::string &_renderEngine)
218217
auto *engine = gz::rendering::engine(_renderEngine);
219218
if (!engine)
220219
{
221-
gzdbg << "Engine '" << _renderEngine
220+
GTEST_SKIP() << "Engine '" << _renderEngine
222221
<< "' is not supported" << std::endl;
223-
return;
224222
}
225223

226224
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -515,9 +513,8 @@ void CameraSensorTest::CameraProjection(const std::string &_renderEngine)
515513
auto *engine = gz::rendering::engine(_renderEngine);
516514
if (!engine)
517515
{
518-
gzdbg << "Engine '" << _renderEngine
516+
GTEST_SKIP() << "Engine '" << _renderEngine
519517
<< "' is not supported" << std::endl;
520-
return;
521518
}
522519

523520
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -807,9 +804,8 @@ void CameraSensorTest::ImageFormatLInt8LInt16(const std::string &_renderEngine)
807804
auto *engine = gz::rendering::engine(_renderEngine);
808805
if (!engine)
809806
{
810-
gzdbg << "Engine '" << _renderEngine
807+
GTEST_SKIP() << "Engine '" << _renderEngine
811808
<< "' is not supported" << std::endl;
812-
return;
813809
}
814810

815811
gz::rendering::ScenePtr scene = engine->CreateScene("scene");

‎test/integration/depth_camera.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,8 @@ void DepthCameraSensorTest::ImagesWithBuiltinSDF(
198198
if ((_renderEngine.compare("ogre") != 0) &&
199199
(_renderEngine.compare("ogre2") != 0))
200200
{
201-
gzdbg << "Engine '" << _renderEngine
201+
GTEST_SKIP() << "Engine '" << _renderEngine
202202
<< "' doesn't support depth cameras" << std::endl;
203-
return;
204203
}
205204

206205
// Setup gz-rendering with an empty scene

‎test/integration/distortion_camera.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,16 @@ void DistortionCameraSensorTest::ImagesWithBuiltinSDF(
8181

8282
if (_renderEngine == "ogre2")
8383
{
84-
gzdbg << "Distortion camera not supported yet in rendering engine: "
84+
GTEST_SKIP() << "Distortion camera not supported yet in rendering engine: "
8585
<< _renderEngine << std::endl;
86-
return;
8786
}
8887

8988
// Setup gz-rendering with an empty scene
9089
auto *engine = gz::rendering::engine(_renderEngine);
9190
if (!engine)
9291
{
93-
gzdbg << "Engine '" << _renderEngine
92+
GTEST_SKIP() << "Engine '" << _renderEngine
9493
<< "' is not supported" << std::endl;
95-
return;
9694
}
9795

9896
gz::rendering::ScenePtr scene = engine->CreateScene("scene");

‎test/integration/gpu_lidar_sensor.cc‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,8 @@ void GpuLidarSensorTest::CreateGpuLidar(const std::string &_renderEngine)
209209
auto *engine = gz::rendering::engine(_renderEngine);
210210
if (!engine)
211211
{
212-
gzdbg << "Engine '" << _renderEngine
212+
GTEST_SKIP() << "Engine '" << _renderEngine
213213
<< "' is not supported" << std::endl;
214-
return;
215214
}
216215

217216
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -330,9 +329,8 @@ void GpuLidarSensorTest::DetectBox(const std::string &_renderEngine)
330329
gz::rendering::engine(_renderEngine);
331330
if (!engine)
332331
{
333-
gzdbg << "Engine '" << _renderEngine
332+
GTEST_SKIP() << "Engine '" << _renderEngine
334333
<< "' is not supported" << std::endl;
335-
return;
336334
}
337335

338336
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -502,9 +500,8 @@ void GpuLidarSensorTest::TestThreeBoxes(const std::string &_renderEngine)
502500
gz::rendering::engine(_renderEngine);
503501
if (!engine)
504502
{
505-
gzdbg << "Engine '" << _renderEngine
503+
GTEST_SKIP() << "Engine '" << _renderEngine
506504
<< "' is not supported" << std::endl;
507-
return;
508505
}
509506

510507
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -651,9 +648,8 @@ void GpuLidarSensorTest::VerticalLidar(const std::string &_renderEngine)
651648
gz::rendering::engine(_renderEngine);
652649
if (!engine)
653650
{
654-
gzdbg << "Engine '" << _renderEngine
651+
GTEST_SKIP() << "Engine '" << _renderEngine
655652
<< "' is not supported" << std::endl;
656-
return;
657653
}
658654

659655
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -787,9 +783,8 @@ void GpuLidarSensorTest::ManualUpdate(const std::string &_renderEngine)
787783
gz::rendering::engine(_renderEngine);
788784
if (!engine)
789785
{
790-
gzdbg << "Engine '" << _renderEngine
786+
GTEST_SKIP() << "Engine '" << _renderEngine
791787
<< "' is not supported" << std::endl;
792-
return;
793788
}
794789

795790
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -897,9 +892,8 @@ void GpuLidarSensorTest::Topic(const std::string &_renderEngine)
897892
auto engine = gz::rendering::engine(_renderEngine);
898893
if (!engine)
899894
{
900-
gzdbg << "Engine '" << _renderEngine
895+
GTEST_SKIP() << "Engine '" << _renderEngine
901896
<< "' is not supported" << std::endl;
902-
return;
903897
}
904898
auto scene = engine->CreateScene("scene");
905899
EXPECT_NE(nullptr, scene);

‎test/integration/rgbd_camera.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,18 +212,16 @@ void RgbdCameraSensorTest::ImagesWithBuiltinSDF(
212212
if ((_renderEngine.compare("ogre") != 0) &&
213213
(_renderEngine.compare("ogre2") != 0))
214214
{
215-
gzdbg << "Engine '" << _renderEngine
215+
GTEST_SKIP() << "Engine '" << _renderEngine
216216
<< "' doesn't support rgbd cameras" << std::endl;
217-
return;
218217
}
219218

220219
// Setup gz-rendering with an empty scene
221220
auto *engine = rendering::engine(_renderEngine);
222221
if (!engine)
223222
{
224-
gzdbg << "Engine '" << _renderEngine
223+
GTEST_SKIP() << "Engine '" << _renderEngine
225224
<< "' is not supported" << std::endl;
226-
return;
227225
}
228226

229227
rendering::ScenePtr scene = engine->CreateScene("scene");

‎test/integration/segmentation_camera.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,17 +191,15 @@ void SegmentationCameraSensorTest::ImagesWithBuiltinSDF(
191191
// If ogre2 is not the engine, don't run the test
192192
if (_renderEngine.compare("ogre2") != 0)
193193
{
194-
gzdbg << "Engine '" << _renderEngine
194+
GTEST_SKIP() << "Engine '" << _renderEngine
195195
<< "' doesn't support segmentation cameras" << std::endl;
196-
return;
197196
}
198197
// Setup gz-rendering with an empty scene
199198
auto *engine = gz::rendering::engine(_renderEngine);
200199
if (!engine)
201200
{
202-
gzdbg << "Engine '" << _renderEngine
201+
GTEST_SKIP() << "Engine '" << _renderEngine
203202
<< "' is not supported" << std::endl;
204-
return;
205203
}
206204

207205
gz::rendering::ScenePtr scene = engine->CreateScene("scene");

‎test/integration/thermal_camera.cc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,16 @@ void ThermalCameraSensorTest::ImagesWithBuiltinSDF(
151151
if ((_renderEngine.compare("ogre") != 0) &&
152152
(_renderEngine.compare("ogre2") != 0))
153153
{
154-
gzdbg << "Engine '" << _renderEngine
154+
GTEST_SKIP() << "Engine '" << _renderEngine
155155
<< "' doesn't support thermal cameras" << std::endl;
156-
return;
157156
}
158157

159158
// Setup gz-rendering with an empty scene
160159
auto *engine = gz::rendering::engine(_renderEngine);
161160
if (!engine)
162161
{
163-
gzdbg << "Engine '" << _renderEngine
162+
GTEST_SKIP() << "Engine '" << _renderEngine
164163
<< "' is not supported" << std::endl;
165-
return;
166164
}
167165

168166
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -421,18 +419,16 @@ void ThermalCameraSensorTest::Images8BitWithBuiltinSDF(
421419
// If ogre2 is not the engine, don't run the test
422420
if ((_renderEngine.compare("ogre2") != 0))
423421
{
424-
gzdbg << "Engine '" << _renderEngine
422+
GTEST_SKIP() << "Engine '" << _renderEngine
425423
<< "' doesn't support 8 bit thermal cameras" << std::endl;
426-
return;
427424
}
428425

429426
// Setup gz-rendering with an empty scene
430427
auto *engine = gz::rendering::engine(_renderEngine);
431428
if (!engine)
432429
{
433-
gzdbg << "Engine '" << _renderEngine
430+
GTEST_SKIP() << "Engine '" << _renderEngine
434431
<< "' is not supported" << std::endl;
435-
return;
436432
}
437433

438434
gz::rendering::ScenePtr scene = engine->CreateScene("scene");

‎test/integration/triggered_boundingbox_camera.cc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,16 @@ void TriggeredBoundingBoxCameraTest::BoxesWithBuiltinSDF(
135135
// Skip unsupported engines
136136
if (_renderEngine != "ogre2")
137137
{
138-
gzdbg << "Engine '" << _renderEngine
138+
GTEST_SKIP() << "Engine '" << _renderEngine
139139
<< "' doesn't support bounding box cameras" << std::endl;
140-
return;
141140
}
142141

143142
// Setup gz-rendering with an empty scene
144143
auto *engine = gz::rendering::engine(_renderEngine);
145144
if (!engine)
146145
{
147-
gzdbg << "Engine '" << _renderEngine
146+
GTEST_SKIP() << "Engine '" << _renderEngine
148147
<< "' is not supported" << std::endl;
149-
return;
150148
}
151149

152150
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -238,18 +236,16 @@ void TriggeredBoundingBoxCameraTest::EmptyTriggerTopic(
238236
// Skip unsupported engines
239237
if (_renderEngine != "ogre2")
240238
{
241-
gzdbg << "Engine '" << _renderEngine
239+
GTEST_SKIP() << "Engine '" << _renderEngine
242240
<< "' doesn't support bounding box cameras" << std::endl;
243-
return;
244241
}
245242

246243
// Setup gz-rendering with an empty scene
247244
auto *engine = gz::rendering::engine(_renderEngine);
248245
if (!engine)
249246
{
250-
gzdbg << "Engine '" << _renderEngine
247+
GTEST_SKIP() << "Engine '" << _renderEngine
251248
<< "' is not supported" << std::endl;
252-
return;
253249
}
254250

255251
gz::rendering::ScenePtr scene = engine->CreateScene("scene");

‎test/integration/triggered_camera.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ void TriggeredCameraTest::ImagesWithBuiltinSDF(const std::string &_renderEngine)
8787
auto *engine = gz::rendering::engine(_renderEngine);
8888
if (!engine)
8989
{
90-
gzdbg << "Engine '" << _renderEngine
90+
GTEST_SKIP() << "Engine '" << _renderEngine
9191
<< "' is not supported" << std::endl;
92-
return;
9392
}
9493

9594
gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -182,9 +181,8 @@ void TriggeredCameraTest::EmptyTriggerTopic(const std::string &_renderEngine)
182181
auto *engine = gz::rendering::engine(_renderEngine);
183182
if (!engine)
184183
{
185-
gzdbg << "Engine '" << _renderEngine
184+
GTEST_SKIP() << "Engine '" << _renderEngine
186185
<< "' is not supported" << std::endl;
187-
return;
188186
}
189187

190188
gz::rendering::ScenePtr scene = engine->CreateScene("scene");

0 commit comments

Comments
 (0)