Skip to content

Commit

Permalink
Fail test if no scene can be created (gz-rendering6) (#1090)
Browse files Browse the repository at this point in the history
* Fail test if no scene can be created

Replace current print by a FAIL in Gtest to make the test
that can not create an scene to fail. This should help to
avoid false positives in testing.

---------

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
  • Loading branch information
j-rivero authored Dec 13, 2024
1 parent 46cde99 commit 5901faa
Show file tree
Hide file tree
Showing 34 changed files with 70 additions and 71 deletions.
5 changes: 2 additions & 3 deletions src/ArrowVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ void ArrowVisualTest::ArrowVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
}

ScenePtr scene = engine->CreateScene("scene");
Expand Down
2 changes: 1 addition & 1 deletion src/AxisVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void AxisVisualTest::AxisVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/BoundingBoxCamera_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void BoundingBoxCameraTest::BoundingBoxCamera(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/COMVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void COMVisualTest::COMVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
12 changes: 6 additions & 6 deletions src/Camera_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void CameraTest::ViewProjectionMatrix(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -171,7 +171,7 @@ void CameraTest::RenderTexture(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -229,7 +229,7 @@ void CameraTest::TrackFollow(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -305,7 +305,7 @@ void CameraTest::AddRemoveRenderPass(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -363,7 +363,7 @@ void CameraTest::VisibilityMask(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -400,7 +400,7 @@ void CameraTest::IntrinsicMatrix(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Capsule_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void CapsuleTest::Capsule(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/GaussianNoisePass_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void GaussianNoisePassTest::GaussianNoise(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/GizmoVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void GizmoVisualTest::GizmoVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -117,7 +117,7 @@ void GizmoVisualTest::Material(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Grid_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void GridTest::Grid(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Heightmap_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ TEST_P(HeightmapTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Heightmap))
auto engine = rendering::engine(renderEngine);
if (!engine)
{
igndbg << "Engine '" << renderEngine
FAIL() << "Engine '" << renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/InertiaVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void InertiaVisualTest::InertiaVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/JointVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void JointVisualTest::JointVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/LidarVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void LidarVisualTest::LidarVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/LightVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void LightVisualTest::LightVisual(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Light_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void LightTest::Light(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Marker_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void MarkerTest::Marker(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -200,7 +200,7 @@ void MarkerTest::Material(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Material_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void MaterialTest::MaterialProperties(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -301,7 +301,7 @@ void MaterialTest::Copy(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/MeshDescriptor_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void MeshDescriptorTest::Descriptor(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Mesh_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void MeshTest::MeshSubMesh(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -134,7 +134,7 @@ void MeshTest::MeshSkeleton(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -237,7 +237,7 @@ void MeshTest::MeshSkeletonAnimation(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -337,7 +337,7 @@ void MeshTest::MeshClone(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/MoveToHelper_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void MoveToHelperTest::MoveTo(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Node_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void NodeTest::Pose(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
6 changes: 3 additions & 3 deletions src/OrbitViewController_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void OrbitViewControllerTest::OrbitViewControl(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -102,7 +102,7 @@ void OrbitViewControllerTest::OrbitViewControlCameraConstructor(
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -142,7 +142,7 @@ void OrbitViewControllerTest::Control(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/OrthoViewController_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void OrthoViewControllerTest::OrthoViewControl(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -96,7 +96,7 @@ void OrthoViewControllerTest::Control(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/RayQuery_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void RayQueryTest::RayQuery(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/RenderEngine_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void RenderEngineTest::RenderEngine(const std::string &_renderEngine)
auto engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/RenderPassSystem_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void RenderPassSystemTest::RenderPassSystem(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
6 changes: 3 additions & 3 deletions src/RenderTarget_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void RenderTargetTest::RenderTexture(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -100,7 +100,7 @@ void RenderTargetTest::RenderWindow(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down Expand Up @@ -153,7 +153,7 @@ void RenderTargetTest::AddRemoveRenderPass(const std::string &_renderEngine)
RenderEngine *engine = rendering::engine(_renderEngine);
if (!engine)
{
igndbg << "Engine '" << _renderEngine
FAIL() << "Engine '" << _renderEngine
<< "' is not supported" << std::endl;
return;
}
Expand Down
Loading

0 comments on commit 5901faa

Please sign in to comment.