Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions test/integration/boundingbox_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -216,18 +216,16 @@ void BoundingBoxCameraSensorTest::BoxesWithBuiltinSDF(
// Skip unsupported engines
if (_renderEngine != "ogre2")
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support bounding box cameras" << std::endl;
return;
}

// Setup gz-rendering with an empty scene
auto *engine = rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -385,18 +383,16 @@ void BoundingBoxCameraSensorTest::Boxes3DWithBuiltinSDF(
// Skip unsupported engines
if (_renderEngine != "ogre2")
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support bounding box cameras" << std::endl;
return;
}

// Setup gz-rendering with an empty scene
auto *engine = rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
12 changes: 4 additions & 8 deletions test/integration/camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,8 @@ void CameraSensorTest::ImagesWithBuiltinSDF(const std::string &_renderEngine)
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -218,9 +217,8 @@ void CameraSensorTest::CameraIntrinsics(const std::string &_renderEngine)
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -515,9 +513,8 @@ void CameraSensorTest::CameraProjection(const std::string &_renderEngine)
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -807,9 +804,8 @@ void CameraSensorTest::ImageFormatLInt8LInt16(const std::string &_renderEngine)
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
3 changes: 1 addition & 2 deletions test/integration/depth_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,8 @@ void DepthCameraSensorTest::ImagesWithBuiltinSDF(
if ((_renderEngine.compare("ogre") != 0) &&
(_renderEngine.compare("ogre2") != 0))
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support depth cameras" << std::endl;
return;
}

// Setup gz-rendering with an empty scene
Expand Down
10 changes: 5 additions & 5 deletions test/integration/distortion_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,18 @@ void DistortionCameraSensorTest::ImagesWithBuiltinSDF(

if (_renderEngine == "ogre2")
{
gzdbg << "Distortion camera not supported yet in rendering engine: "
<< _renderEngine << std::endl;
return;
GTEST_SKIP() << "Distortion camera not supported yet in rendering engine: "
<< _renderEngine
<< ", see https://github.com/gazebosim/gz-rendering/issues/697"
<< std::endl;
}

// Setup gz-rendering with an empty scene
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
7 changes: 5 additions & 2 deletions test/integration/dvl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,11 @@ class DopplerVelocityLogTest : public testing::Test,
// Documentation inherited
protected: void TearDown() override
{
engine->DestroyScene(scene);
rendering::unloadEngine(engine->Name());
if (engine)
{
engine->DestroyScene(scene);
rendering::unloadEngine(engine->Name());
}
}

rendering::RenderEngine *engine{nullptr};
Expand Down
18 changes: 6 additions & 12 deletions test/integration/gpu_lidar_sensor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,8 @@ void GpuLidarSensorTest::CreateGpuLidar(const std::string &_renderEngine)
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -330,9 +329,8 @@ void GpuLidarSensorTest::DetectBox(const std::string &_renderEngine)
gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -502,9 +500,8 @@ void GpuLidarSensorTest::TestThreeBoxes(const std::string &_renderEngine)
gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -651,9 +648,8 @@ void GpuLidarSensorTest::VerticalLidar(const std::string &_renderEngine)
gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -787,9 +783,8 @@ void GpuLidarSensorTest::ManualUpdate(const std::string &_renderEngine)
gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -897,9 +892,8 @@ void GpuLidarSensorTest::Topic(const std::string &_renderEngine)
auto engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
auto scene = engine->CreateScene("scene");
EXPECT_NE(nullptr, scene);
Expand Down
6 changes: 2 additions & 4 deletions test/integration/rgbd_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -212,18 +212,16 @@ void RgbdCameraSensorTest::ImagesWithBuiltinSDF(
if ((_renderEngine.compare("ogre") != 0) &&
(_renderEngine.compare("ogre2") != 0))
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support rgbd cameras" << std::endl;
return;
}

// Setup gz-rendering with an empty scene
auto *engine = rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
6 changes: 2 additions & 4 deletions test/integration/segmentation_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,15 @@ void SegmentationCameraSensorTest::ImagesWithBuiltinSDF(
// If ogre2 is not the engine, don't run the test
if (_renderEngine.compare("ogre2") != 0)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support segmentation cameras" << std::endl;
return;
}
// Setup gz-rendering with an empty scene
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
12 changes: 4 additions & 8 deletions test/integration/thermal_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,16 @@ void ThermalCameraSensorTest::ImagesWithBuiltinSDF(
if ((_renderEngine.compare("ogre") != 0) &&
(_renderEngine.compare("ogre2") != 0))
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support thermal cameras" << std::endl;
return;
}

// Setup gz-rendering with an empty scene
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

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

// Setup gz-rendering with an empty scene
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
12 changes: 4 additions & 8 deletions test/integration/triggered_boundingbox_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,16 @@ void TriggeredBoundingBoxCameraTest::BoxesWithBuiltinSDF(
// Skip unsupported engines
if (_renderEngine != "ogre2")
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support bounding box cameras" << std::endl;
return;
}

// Setup gz-rendering with an empty scene
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -238,18 +236,16 @@ void TriggeredBoundingBoxCameraTest::EmptyTriggerTopic(
// Skip unsupported engines
if (_renderEngine != "ogre2")
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' doesn't support bounding box cameras" << std::endl;
return;
}

// Setup gz-rendering with an empty scene
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
6 changes: 2 additions & 4 deletions test/integration/triggered_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ void TriggeredCameraTest::ImagesWithBuiltinSDF(const std::string &_renderEngine)
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down Expand Up @@ -182,9 +181,8 @@ void TriggeredCameraTest::EmptyTriggerTopic(const std::string &_renderEngine)
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
3 changes: 1 addition & 2 deletions test/integration/wide_angle_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,8 @@ void WideAngleCameraSensorTest::ImagesWithBuiltinSDF(
auto *engine = gz::rendering::engine(_renderEngine);
if (!engine)
{
gzdbg << "Engine '" << _renderEngine
GTEST_SKIP() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}

gz::rendering::ScenePtr scene = engine->CreateScene("scene");
Expand Down
Loading