From 11fa271eb53c99e56bbaa536fbd50ff308ae2d14 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Mon, 3 Jun 2024 10:40:35 -0500 Subject: [PATCH] Test: Support system GTest, and give warning if no submodule (#13662) --- tests/CMakeLists.txt | 16 +++++++++++++++- tests/src/App/Application.cpp | 2 +- tests/src/App/Branding.cpp | 2 +- tests/src/App/Color.cpp | 2 +- tests/src/App/ComplexGeoData.cpp | 2 +- tests/src/App/Document.cpp | 2 +- tests/src/App/ElementMap.cpp | 2 +- tests/src/App/Expression.cpp | 2 +- tests/src/App/ExpressionParser.cpp | 2 +- tests/src/App/IndexedName.cpp | 2 +- tests/src/App/License.cpp | 2 +- tests/src/App/MappedElement.cpp | 2 +- tests/src/App/MappedName.cpp | 2 +- tests/src/App/Metadata.cpp | 2 +- tests/src/App/ProjectFile.cpp | 2 +- tests/src/App/Property.cpp | 2 +- tests/src/App/PropertyExpressionEngine.cpp | 2 +- tests/src/App/StringHasher.cpp | 2 +- tests/src/App/VRMLObject.cpp | 2 +- tests/src/App/VarSet.cpp | 2 +- tests/src/Base/Axis.cpp | 2 +- tests/src/Base/Bitmask.cpp | 2 +- tests/src/Base/BoundBox.cpp | 2 +- tests/src/Base/Builder3D.cpp | 2 +- tests/src/Base/CoordinateSystem.cpp | 2 +- tests/src/Base/DualNumber.cpp | 2 +- tests/src/Base/DualQuaternion.cpp | 2 +- tests/src/Base/Handle.cpp | 2 +- tests/src/Base/Matrix.cpp | 2 +- tests/src/Base/Parameter.cpp | 2 +- tests/src/Base/Placement.cpp | 2 +- tests/src/Base/Quantity.cpp | 2 +- tests/src/Base/Reader.cpp | 2 +- tests/src/Base/Rotation.cpp | 2 +- tests/src/Base/Stream.cpp | 2 +- tests/src/Base/TimeInfo.cpp | 2 +- tests/src/Base/Tools.cpp | 2 +- tests/src/Base/Tools2D.cpp | 2 +- tests/src/Base/Tools3D.cpp | 2 +- tests/src/Base/Unit.cpp | 2 +- tests/src/Base/Vector3D.cpp | 2 +- tests/src/Base/ViewProj.cpp | 2 +- tests/src/Base/Writer.cpp | 2 +- tests/src/Gui/Assistant.cpp | 2 +- tests/src/Misc/fmt.cpp | 2 +- tests/src/Mod/Assembly/App/AssemblyObject.cpp | 2 +- tests/src/Mod/Material/App/TestMaterialCards.cpp | 2 +- .../Mod/Material/App/TestMaterialProperties.cpp | 2 +- tests/src/Mod/Material/App/TestMaterialValue.cpp | 2 +- tests/src/Mod/Material/App/TestMaterials.cpp | 2 +- tests/src/Mod/Material/App/TestModel.cpp | 2 +- .../src/Mod/Material/App/TestModelProperties.cpp | 2 +- tests/src/Mod/Mesh/App/Core/KDTree.cpp | 2 +- tests/src/Mod/Mesh/App/Exporter.cpp | 2 +- tests/src/Mod/Mesh/App/Mesh.cpp | 2 +- tests/src/Mod/Part/App/AttachExtension.cpp | 2 +- tests/src/Mod/Part/App/Attacher.cpp | 2 +- tests/src/Mod/Part/App/BRepMesh.cpp | 2 +- tests/src/Mod/Part/App/FeatureChamfer.cpp | 2 +- tests/src/Mod/Part/App/FeatureCompound.cpp | 2 +- tests/src/Mod/Part/App/FeatureFillet.cpp | 2 +- tests/src/Mod/Part/App/FeatureMirroring.cpp | 2 +- tests/src/Mod/Part/App/FeatureOffset.cpp | 2 +- tests/src/Mod/Part/App/FeaturePartBoolean.cpp | 2 +- tests/src/Mod/Part/App/FeaturePartCommon.cpp | 2 +- tests/src/Mod/Part/App/FeaturePartCut.cpp | 2 +- tests/src/Mod/Part/App/FeaturePartFuse.cpp | 2 +- tests/src/Mod/Part/App/FeatureRevolution.cpp | 2 +- tests/src/Mod/Part/App/PartFeature.cpp | 2 +- tests/src/Mod/Part/App/PartFeatures.cpp | 2 +- tests/src/Mod/Part/App/PartTestHelpers.h | 2 +- tests/src/Mod/Part/App/PropertyTopoShape.cpp | 2 +- tests/src/Mod/Part/App/TopoDS_Shape.cpp | 2 +- tests/src/Mod/Part/App/TopoShape.cpp | 2 +- tests/src/Mod/Part/App/TopoShapeCache.cpp | 2 +- tests/src/Mod/Part/App/TopoShapeExpansion.cpp | 2 +- .../Mod/Part/App/TopoShapeMakeElementRefine.cpp | 2 +- tests/src/Mod/Part/App/TopoShapeMakeShape.cpp | 2 +- .../App/TopoShapeMakeShapeWithElementMap.cpp | 2 +- tests/src/Mod/Part/App/TopoShapeMapper.cpp | 2 +- tests/src/Mod/Part/App/WireJoiner.cpp | 2 +- tests/src/Mod/PartDesign/App/DatumPlane.cpp | 2 +- tests/src/Mod/PartDesign/App/ShapeBinder.cpp | 2 +- tests/src/Mod/Points/App/Points.cpp | 2 +- tests/src/Mod/Sketcher/App/SketchObject.cpp | 2 +- .../Mod/Sketcher/App/planegcs/Constraints.cpp | 2 +- tests/src/Mod/Sketcher/App/planegcs/GCS.cpp | 2 +- tests/src/zipios++/collectioncollection.cpp | 2 +- tests/src/zipios++/zipfile.cpp | 2 +- 89 files changed, 103 insertions(+), 89 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b2db7ee0e8..63df6fdf0a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,3 +1,15 @@ +if ( EXISTS "${CMAKE_SOURCE_DIR}/tests/lib/googletest" ) + include_directories( ${CMAKE_SOURCE_DIR}/tests/lib/googletest/include/ ) + include_directories( ${CMAKE_SOURCE_DIR}/tests/lib/googlemock/include/ ) +else() + find_package(GTest) + if( GTest_FOUND ) + message( STATUS "Found Google Test: version ${GTest_VERSION}" ) + else() + message( SEND_ERROR "The Google Test submodule is not available. Please run git submodule update --init" ) + endif() +endif() + if(MSVC) add_compile_options(/wd4251) @@ -108,7 +120,9 @@ foreach (exe ${TestExecutables}) add_executable(${exe}) endforeach() -add_subdirectory(lib) +if ( EXISTS "${CMAKE_SOURCE_DIR}/tests/lib/googletest" ) + add_subdirectory(lib) +endif() add_subdirectory(src) target_include_directories(Tests_run PUBLIC diff --git a/tests/src/App/Application.cpp b/tests/src/App/Application.cpp index 41a05b3878..df69f5ea7e 100644 --- a/tests/src/App/Application.cpp +++ b/tests/src/App/Application.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #define FC_OS_MACOSX 1 #include "App/ProgramOptionsUtilities.h" diff --git a/tests/src/App/Branding.cpp b/tests/src/App/Branding.cpp index baf21881a8..1b0ff52df4 100644 --- a/tests/src/App/Branding.cpp +++ b/tests/src/App/Branding.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "App/Branding.h" diff --git a/tests/src/App/Color.cpp b/tests/src/App/Color.cpp index 99db0efd4c..7f8bcc859a 100644 --- a/tests/src/App/Color.cpp +++ b/tests/src/App/Color.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include "App/Color.h" diff --git a/tests/src/App/ComplexGeoData.cpp b/tests/src/App/ComplexGeoData.cpp index 3ffc72e133..ed5155a26f 100644 --- a/tests/src/App/ComplexGeoData.cpp +++ b/tests/src/App/ComplexGeoData.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/App/Document.cpp b/tests/src/App/Document.cpp index 5ac999765d..5a7d84e9e8 100644 --- a/tests/src/App/Document.cpp +++ b/tests/src/App/Document.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include "App/Application.h" diff --git a/tests/src/App/ElementMap.cpp b/tests/src/App/ElementMap.cpp index dd425ed099..38c6784bf1 100644 --- a/tests/src/App/ElementMap.cpp +++ b/tests/src/App/ElementMap.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/App/Expression.cpp b/tests/src/App/Expression.cpp index 8c08e2050b..96a53bcf0b 100644 --- a/tests/src/App/Expression.cpp +++ b/tests/src/App/Expression.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "App/ExpressionParser.h" #include "App/ExpressionTokenizer.h" diff --git a/tests/src/App/ExpressionParser.cpp b/tests/src/App/ExpressionParser.cpp index fc95dafafe..f0eff0b626 100644 --- a/tests/src/App/ExpressionParser.cpp +++ b/tests/src/App/ExpressionParser.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "Base/Quantity.h" diff --git a/tests/src/App/IndexedName.cpp b/tests/src/App/IndexedName.cpp index f94d3c529f..c51eec01eb 100644 --- a/tests/src/App/IndexedName.cpp +++ b/tests/src/App/IndexedName.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "App/IndexedName.h" diff --git a/tests/src/App/License.cpp b/tests/src/App/License.cpp index f6674ea098..972a225d5c 100644 --- a/tests/src/App/License.cpp +++ b/tests/src/App/License.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "App/License.h" diff --git a/tests/src/App/MappedElement.cpp b/tests/src/App/MappedElement.cpp index 36588a8d92..3f1ecb622f 100644 --- a/tests/src/App/MappedElement.cpp +++ b/tests/src/App/MappedElement.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "App/IndexedName.h" #include "App/MappedElement.h" diff --git a/tests/src/App/MappedName.cpp b/tests/src/App/MappedName.cpp index 2d01858562..a53c476110 100644 --- a/tests/src/App/MappedName.cpp +++ b/tests/src/App/MappedName.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "App/ComplexGeoData.h" #include "App/MappedName.h" diff --git a/tests/src/App/Metadata.cpp b/tests/src/App/Metadata.cpp index fa045cc7ea..7d57fb09fe 100644 --- a/tests/src/App/Metadata.cpp +++ b/tests/src/App/Metadata.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ // NOLINTNEXTLINE -#include "gtest/gtest.h" +#include #include "App/Metadata.h" diff --git a/tests/src/App/ProjectFile.cpp b/tests/src/App/ProjectFile.cpp index d726b7d350..5ed8042476 100644 --- a/tests/src/App/ProjectFile.cpp +++ b/tests/src/App/ProjectFile.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "InitApplication.h" #include diff --git a/tests/src/App/Property.cpp b/tests/src/App/Property.cpp index 1bcc2d78b8..9ab8aeffa6 100644 --- a/tests/src/App/Property.cpp +++ b/tests/src/App/Property.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "App/PropertyLinks.h" diff --git a/tests/src/App/PropertyExpressionEngine.cpp b/tests/src/App/PropertyExpressionEngine.cpp index 99d165dbce..19554c4936 100644 --- a/tests/src/App/PropertyExpressionEngine.cpp +++ b/tests/src/App/PropertyExpressionEngine.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "Base/Quantity.h" diff --git a/tests/src/App/StringHasher.cpp b/tests/src/App/StringHasher.cpp index c13b0b6620..b4fbce07cd 100644 --- a/tests/src/App/StringHasher.cpp +++ b/tests/src/App/StringHasher.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1-or-later #include "App/MappedName.h" -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/App/VRMLObject.cpp b/tests/src/App/VRMLObject.cpp index f6e2a6ef36..0d53b0ccf4 100644 --- a/tests/src/App/VRMLObject.cpp +++ b/tests/src/App/VRMLObject.cpp @@ -21,7 +21,7 @@ * * **************************************************************************/ -#include "gtest/gtest.h" +#include #include "gmock/gmock.h" #include diff --git a/tests/src/App/VarSet.cpp b/tests/src/App/VarSet.cpp index db5eead3d7..7ba3dc665a 100644 --- a/tests/src/App/VarSet.cpp +++ b/tests/src/App/VarSet.cpp @@ -20,7 +20,7 @@ * * ****************************************************************************/ -#include "gtest/gtest.h" +#include #include "gmock/gmock.h" #include diff --git a/tests/src/Base/Axis.cpp b/tests/src/Base/Axis.cpp index bc01cd7cb8..fc3bd39840 100644 --- a/tests/src/Base/Axis.cpp +++ b/tests/src/Base/Axis.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include TEST(Axis, TestDefault) diff --git a/tests/src/Base/Bitmask.cpp b/tests/src/Base/Bitmask.cpp index 97909d3809..31dcb871a5 100644 --- a/tests/src/Base/Bitmask.cpp +++ b/tests/src/Base/Bitmask.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Base/BoundBox.cpp b/tests/src/Base/BoundBox.cpp index 21e8be6f63..bcb0555819 100644 --- a/tests/src/Base/BoundBox.cpp +++ b/tests/src/Base/BoundBox.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX diff --git a/tests/src/Base/Builder3D.cpp b/tests/src/Base/Builder3D.cpp index 1337ec76ab..89d2684109 100644 --- a/tests/src/Base/Builder3D.cpp +++ b/tests/src/Base/Builder3D.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Base/CoordinateSystem.cpp b/tests/src/Base/CoordinateSystem.cpp index 1706ffbcc0..f97e8cc0c7 100644 --- a/tests/src/Base/CoordinateSystem.cpp +++ b/tests/src/Base/CoordinateSystem.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Base/DualNumber.cpp b/tests/src/Base/DualNumber.cpp index 6d733e82e6..1c4673baf5 100644 --- a/tests/src/Base/DualNumber.cpp +++ b/tests/src/Base/DualNumber.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include TEST(DualNumber, TestDefault) diff --git a/tests/src/Base/DualQuaternion.cpp b/tests/src/Base/DualQuaternion.cpp index 950e1542b4..287f67054a 100644 --- a/tests/src/Base/DualQuaternion.cpp +++ b/tests/src/Base/DualQuaternion.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Base/Handle.cpp b/tests/src/Base/Handle.cpp index 09563d2e80..f145f96d4a 100644 --- a/tests/src/Base/Handle.cpp +++ b/tests/src/Base/Handle.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include class Data: public Base::Handled diff --git a/tests/src/Base/Matrix.cpp b/tests/src/Base/Matrix.cpp index 9a29f79e90..63b3bb0a01 100644 --- a/tests/src/Base/Matrix.cpp +++ b/tests/src/Base/Matrix.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Base/Parameter.cpp b/tests/src/Base/Parameter.cpp index a1f03b79e9..15e1fbed76 100644 --- a/tests/src/Base/Parameter.cpp +++ b/tests/src/Base/Parameter.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Base/Placement.cpp b/tests/src/Base/Placement.cpp index 603eeb3a22..252fbe5c8f 100644 --- a/tests/src/Base/Placement.cpp +++ b/tests/src/Base/Placement.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Base/Quantity.cpp b/tests/src/Base/Quantity.cpp index 592bbbcca3..d4a27059f5 100644 --- a/tests/src/Base/Quantity.cpp +++ b/tests/src/Base/Quantity.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Base/Reader.cpp b/tests/src/Base/Reader.cpp index 7ff4f17585..ab6f8a4baa 100644 --- a/tests/src/Base/Reader.cpp +++ b/tests/src/Base/Reader.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #ifdef _MSC_VER #pragma warning(disable : 4996) diff --git a/tests/src/Base/Rotation.cpp b/tests/src/Base/Rotation.cpp index 72a61184bd..860fe15ef3 100644 --- a/tests/src/Base/Rotation.cpp +++ b/tests/src/Base/Rotation.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Base/Stream.cpp b/tests/src/Base/Stream.cpp index 93354e5d31..9c536a903f 100644 --- a/tests/src/Base/Stream.cpp +++ b/tests/src/Base/Stream.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #ifdef _MSC_VER #pragma warning(disable : 4996) diff --git a/tests/src/Base/TimeInfo.cpp b/tests/src/Base/TimeInfo.cpp index ca7d356cf6..7b25ee0f17 100644 --- a/tests/src/Base/TimeInfo.cpp +++ b/tests/src/Base/TimeInfo.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include TEST(TimeInfo, TestDefault) diff --git a/tests/src/Base/Tools.cpp b/tests/src/Base/Tools.cpp index ba470294ee..f2385433d3 100644 --- a/tests/src/Base/Tools.cpp +++ b/tests/src/Base/Tools.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Base/Tools2D.cpp b/tests/src/Base/Tools2D.cpp index 77839d38e4..16e6ed7d9e 100644 --- a/tests/src/Base/Tools2D.cpp +++ b/tests/src/Base/Tools2D.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include class Line2D: public ::testing::Test diff --git a/tests/src/Base/Tools3D.cpp b/tests/src/Base/Tools3D.cpp index 781323b88c..c04351a6fc 100644 --- a/tests/src/Base/Tools3D.cpp +++ b/tests/src/Base/Tools3D.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include class Line3D: public ::testing::Test diff --git a/tests/src/Base/Unit.cpp b/tests/src/Base/Unit.cpp index 0f85c72e79..616abde140 100644 --- a/tests/src/Base/Unit.cpp +++ b/tests/src/Base/Unit.cpp @@ -1,5 +1,5 @@ #include "Base/Unit.h" -#include "gtest/gtest.h" +#include #include // NOLINTBEGIN diff --git a/tests/src/Base/Vector3D.cpp b/tests/src/Base/Vector3D.cpp index 6dba2b5824..993e00e75c 100644 --- a/tests/src/Base/Vector3D.cpp +++ b/tests/src/Base/Vector3D.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include // NOLINTBEGIN diff --git a/tests/src/Base/ViewProj.cpp b/tests/src/Base/ViewProj.cpp index 6b1667f236..c99306f36f 100644 --- a/tests/src/Base/ViewProj.cpp +++ b/tests/src/Base/ViewProj.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Base/Writer.cpp b/tests/src/Base/Writer.cpp index 93bc5a0257..734a9cc2da 100644 --- a/tests/src/Base/Writer.cpp +++ b/tests/src/Base/Writer.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Base/Exception.h" #include "Base/Writer.h" diff --git a/tests/src/Gui/Assistant.cpp b/tests/src/Gui/Assistant.cpp index 1c21f64e0e..8cefbd8665 100644 --- a/tests/src/Gui/Assistant.cpp +++ b/tests/src/Gui/Assistant.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include "Gui/Assistant.h" diff --git a/tests/src/Misc/fmt.cpp b/tests/src/Misc/fmt.cpp index 2a6415e30f..778e03b7ad 100644 --- a/tests/src/Misc/fmt.cpp +++ b/tests/src/Misc/fmt.cpp @@ -1,6 +1,6 @@ #include "fmt/format.h" #include "fmt/printf.h" -#include "gtest/gtest.h" +#include #include // NOLINTBEGIN diff --git a/tests/src/Mod/Assembly/App/AssemblyObject.cpp b/tests/src/Mod/Assembly/App/AssemblyObject.cpp index 2f0f86ef95..f3ac682166 100644 --- a/tests/src/Mod/Assembly/App/AssemblyObject.cpp +++ b/tests/src/Mod/Assembly/App/AssemblyObject.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Mod/Material/App/TestMaterialCards.cpp b/tests/src/Mod/Material/App/TestMaterialCards.cpp index f040900852..67ab9269eb 100644 --- a/tests/src/Mod/Material/App/TestMaterialCards.cpp +++ b/tests/src/Mod/Material/App/TestMaterialCards.cpp @@ -20,7 +20,7 @@ * * **************************************************************************/ -#include "gtest/gtest.h" +#include #include #ifndef _PreComp_ diff --git a/tests/src/Mod/Material/App/TestMaterialProperties.cpp b/tests/src/Mod/Material/App/TestMaterialProperties.cpp index 447adb1c8d..b41294160b 100644 --- a/tests/src/Mod/Material/App/TestMaterialProperties.cpp +++ b/tests/src/Mod/Material/App/TestMaterialProperties.cpp @@ -20,7 +20,7 @@ * * **************************************************************************/ -#include "gtest/gtest.h" +#include #include #ifndef _PreComp_ diff --git a/tests/src/Mod/Material/App/TestMaterialValue.cpp b/tests/src/Mod/Material/App/TestMaterialValue.cpp index 65282e0cf9..90c739ab89 100644 --- a/tests/src/Mod/Material/App/TestMaterialValue.cpp +++ b/tests/src/Mod/Material/App/TestMaterialValue.cpp @@ -20,7 +20,7 @@ * * **************************************************************************/ -#include "gtest/gtest.h" +#include #include #ifndef _PreComp_ diff --git a/tests/src/Mod/Material/App/TestMaterials.cpp b/tests/src/Mod/Material/App/TestMaterials.cpp index d8b9ccb1df..101ec8f7a6 100644 --- a/tests/src/Mod/Material/App/TestMaterials.cpp +++ b/tests/src/Mod/Material/App/TestMaterials.cpp @@ -20,7 +20,7 @@ * * **************************************************************************/ -#include "gtest/gtest.h" +#include #include #ifndef _PreComp_ diff --git a/tests/src/Mod/Material/App/TestModel.cpp b/tests/src/Mod/Material/App/TestModel.cpp index 3050c5046b..0af1dcd4c4 100644 --- a/tests/src/Mod/Material/App/TestModel.cpp +++ b/tests/src/Mod/Material/App/TestModel.cpp @@ -20,7 +20,7 @@ * * **************************************************************************/ -#include "gtest/gtest.h" +#include #include #ifndef _PreComp_ diff --git a/tests/src/Mod/Material/App/TestModelProperties.cpp b/tests/src/Mod/Material/App/TestModelProperties.cpp index ab8190e1aa..f5f37f24f2 100644 --- a/tests/src/Mod/Material/App/TestModelProperties.cpp +++ b/tests/src/Mod/Material/App/TestModelProperties.cpp @@ -20,7 +20,7 @@ * * **************************************************************************/ -#include "gtest/gtest.h" +#include #include #ifndef _PreComp_ diff --git a/tests/src/Mod/Mesh/App/Core/KDTree.cpp b/tests/src/Mod/Mesh/App/Core/KDTree.cpp index b6f705e863..5ffe3ad088 100644 --- a/tests/src/Mod/Mesh/App/Core/KDTree.cpp +++ b/tests/src/Mod/Mesh/App/Core/KDTree.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include // NOLINTBEGIN(cppcoreguidelines-*,readability-*) diff --git a/tests/src/Mod/Mesh/App/Exporter.cpp b/tests/src/Mod/Mesh/App/Exporter.cpp index 7f39340e41..07efa7d2cb 100644 --- a/tests/src/Mod/Mesh/App/Exporter.cpp +++ b/tests/src/Mod/Mesh/App/Exporter.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Mod/Mesh/App/Mesh.cpp b/tests/src/Mod/Mesh/App/Mesh.cpp index af81caf393..3d0dea51b1 100644 --- a/tests/src/Mod/Mesh/App/Mesh.cpp +++ b/tests/src/Mod/Mesh/App/Mesh.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Mod/Part/App/AttachExtension.cpp b/tests/src/Mod/Part/App/AttachExtension.cpp index 58de7339cf..0123831b9e 100644 --- a/tests/src/Mod/Part/App/AttachExtension.cpp +++ b/tests/src/Mod/Part/App/AttachExtension.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Mod/Part/App/Attacher.cpp b/tests/src/Mod/Part/App/Attacher.cpp index 4ce0429739..53ac4819ee 100644 --- a/tests/src/Mod/Part/App/Attacher.cpp +++ b/tests/src/Mod/Part/App/Attacher.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "PartTestHelpers.h" #include diff --git a/tests/src/Mod/Part/App/BRepMesh.cpp b/tests/src/Mod/Part/App/BRepMesh.cpp index 02683fbf58..ed41c5b447 100644 --- a/tests/src/Mod/Part/App/BRepMesh.cpp +++ b/tests/src/Mod/Part/App/BRepMesh.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/BRepMesh.h" // NOLINTBEGIN diff --git a/tests/src/Mod/Part/App/FeatureChamfer.cpp b/tests/src/Mod/Part/App/FeatureChamfer.cpp index 0caf4c115e..64d861c478 100644 --- a/tests/src/Mod/Part/App/FeatureChamfer.cpp +++ b/tests/src/Mod/Part/App/FeatureChamfer.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Mod/Part/App/FeatureCompound.cpp b/tests/src/Mod/Part/App/FeatureCompound.cpp index 3a353e5217..1a250b4b5b 100644 --- a/tests/src/Mod/Part/App/FeatureCompound.cpp +++ b/tests/src/Mod/Part/App/FeatureCompound.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/FeatureCompound.h" #include diff --git a/tests/src/Mod/Part/App/FeatureFillet.cpp b/tests/src/Mod/Part/App/FeatureFillet.cpp index 4138bd6f9e..e55f48ca1b 100644 --- a/tests/src/Mod/Part/App/FeatureFillet.cpp +++ b/tests/src/Mod/Part/App/FeatureFillet.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Mod/Part/App/FeatureMirroring.cpp b/tests/src/Mod/Part/App/FeatureMirroring.cpp index baf2e59adf..4baf1333e9 100644 --- a/tests/src/Mod/Part/App/FeatureMirroring.cpp +++ b/tests/src/Mod/Part/App/FeatureMirroring.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Mod/Part/App/FeatureOffset.cpp b/tests/src/Mod/Part/App/FeatureOffset.cpp index 656f4df089..38b4bf18b5 100644 --- a/tests/src/Mod/Part/App/FeatureOffset.cpp +++ b/tests/src/Mod/Part/App/FeatureOffset.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Mod/Part/App/FeaturePartBoolean.cpp b/tests/src/Mod/Part/App/FeaturePartBoolean.cpp index 3a8109e4dc..074b1dc9a1 100644 --- a/tests/src/Mod/Part/App/FeaturePartBoolean.cpp +++ b/tests/src/Mod/Part/App/FeaturePartBoolean.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/FeaturePartBoolean.h" #include diff --git a/tests/src/Mod/Part/App/FeaturePartCommon.cpp b/tests/src/Mod/Part/App/FeaturePartCommon.cpp index 8a9f5e02aa..c5b7648e3b 100644 --- a/tests/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCommon.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/FeaturePartCommon.h" #include diff --git a/tests/src/Mod/Part/App/FeaturePartCut.cpp b/tests/src/Mod/Part/App/FeaturePartCut.cpp index 1bf2b69b0b..900ebe8256 100644 --- a/tests/src/Mod/Part/App/FeaturePartCut.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCut.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/FeaturePartCut.h" #include diff --git a/tests/src/Mod/Part/App/FeaturePartFuse.cpp b/tests/src/Mod/Part/App/FeaturePartFuse.cpp index 9ea4b11392..49f0e365f1 100644 --- a/tests/src/Mod/Part/App/FeaturePartFuse.cpp +++ b/tests/src/Mod/Part/App/FeaturePartFuse.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/FeaturePartFuse.h" #include diff --git a/tests/src/Mod/Part/App/FeatureRevolution.cpp b/tests/src/Mod/Part/App/FeatureRevolution.cpp index 7655cca68d..99abb7ea46 100644 --- a/tests/src/Mod/Part/App/FeatureRevolution.cpp +++ b/tests/src/Mod/Part/App/FeatureRevolution.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/FeatureRevolution.h" #include diff --git a/tests/src/Mod/Part/App/PartFeature.cpp b/tests/src/Mod/Part/App/PartFeature.cpp index fe86470e9f..c89799af69 100644 --- a/tests/src/Mod/Part/App/PartFeature.cpp +++ b/tests/src/Mod/Part/App/PartFeature.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include "Mod/Part/App/FeaturePartCommon.h" diff --git a/tests/src/Mod/Part/App/PartFeatures.cpp b/tests/src/Mod/Part/App/PartFeatures.cpp index fab72f6378..3dad22a8a3 100644 --- a/tests/src/Mod/Part/App/PartFeatures.cpp +++ b/tests/src/Mod/Part/App/PartFeatures.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Part/App/PartFeatures.h" #include diff --git a/tests/src/Mod/Part/App/PartTestHelpers.h b/tests/src/Mod/Part/App/PartTestHelpers.h index 090c65f5e8..ee3efba95f 100644 --- a/tests/src/Mod/Part/App/PartTestHelpers.h +++ b/tests/src/Mod/Part/App/PartTestHelpers.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Mod/Part/App/PropertyTopoShape.cpp b/tests/src/Mod/Part/App/PropertyTopoShape.cpp index e1eb5851b0..1271dce6c6 100644 --- a/tests/src/Mod/Part/App/PropertyTopoShape.cpp +++ b/tests/src/Mod/Part/App/PropertyTopoShape.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include "Mod/Part/App/FeaturePartCommon.h" diff --git a/tests/src/Mod/Part/App/TopoDS_Shape.cpp b/tests/src/Mod/Part/App/TopoDS_Shape.cpp index 404510047d..7b37566bf0 100644 --- a/tests/src/Mod/Part/App/TopoDS_Shape.cpp +++ b/tests/src/Mod/Part/App/TopoDS_Shape.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Mod/Part/App/TopoShape.cpp b/tests/src/Mod/Part/App/TopoShape.cpp index 75afcf1c99..a133e66381 100644 --- a/tests/src/Mod/Part/App/TopoShape.cpp +++ b/tests/src/Mod/Part/App/TopoShape.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "PartTestHelpers.h" #include #include "src/App/InitApplication.h" diff --git a/tests/src/Mod/Part/App/TopoShapeCache.cpp b/tests/src/Mod/Part/App/TopoShapeCache.cpp index b3faa3ca2d..6ac7fd3650 100644 --- a/tests/src/Mod/Part/App/TopoShapeCache.cpp +++ b/tests/src/Mod/Part/App/TopoShapeCache.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp index 33952c3e78..3a39a956b3 100644 --- a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "src/App/InitApplication.h" #include #include "Mod/Part/App/TopoShapeMapper.h" diff --git a/tests/src/Mod/Part/App/TopoShapeMakeElementRefine.cpp b/tests/src/Mod/Part/App/TopoShapeMakeElementRefine.cpp index 84afef491b..b9b699f584 100644 --- a/tests/src/Mod/Part/App/TopoShapeMakeElementRefine.cpp +++ b/tests/src/Mod/Part/App/TopoShapeMakeElementRefine.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Mod/Part/App/TopoShapeMakeShape.cpp b/tests/src/Mod/Part/App/TopoShapeMakeShape.cpp index ff08a446c1..b3f895fd64 100644 --- a/tests/src/Mod/Part/App/TopoShapeMakeShape.cpp +++ b/tests/src/Mod/Part/App/TopoShapeMakeShape.cpp @@ -3,7 +3,7 @@ // Tests for the makeShape methods, extracted from the main set of tests for TopoShape // due to length and complexity. -#include "gtest/gtest.h" +#include #include "src/App/InitApplication.h" #include "PartTestHelpers.h" #include diff --git a/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp b/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp index e002cdedec..1d3254ac2f 100644 --- a/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp +++ b/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp @@ -3,7 +3,7 @@ // Tests for the makeShapeWithElementMap method, extracted from the main set of tests for TopoShape // due to length and complexity. -#include "gtest/gtest.h" +#include #include "src/App/InitApplication.h" #include "PartTestHelpers.h" #include diff --git a/tests/src/Mod/Part/App/TopoShapeMapper.cpp b/tests/src/Mod/Part/App/TopoShapeMapper.cpp index 88c8fa18f6..fad62bcc9d 100644 --- a/tests/src/Mod/Part/App/TopoShapeMapper.cpp +++ b/tests/src/Mod/Part/App/TopoShapeMapper.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "src/App/InitApplication.h" #include #include "Mod/Part/App/TopoShapeMapper.h" diff --git a/tests/src/Mod/Part/App/WireJoiner.cpp b/tests/src/Mod/Part/App/WireJoiner.cpp index c8d45f1733..2fb72bc585 100644 --- a/tests/src/Mod/Part/App/WireJoiner.cpp +++ b/tests/src/Mod/Part/App/WireJoiner.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "src/App/InitApplication.h" #include "Mod/Part/App/WireJoiner.h" #include diff --git a/tests/src/Mod/PartDesign/App/DatumPlane.cpp b/tests/src/Mod/PartDesign/App/DatumPlane.cpp index 8758fedd6a..a7c6c9cf15 100644 --- a/tests/src/Mod/PartDesign/App/DatumPlane.cpp +++ b/tests/src/Mod/PartDesign/App/DatumPlane.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "src/App/InitApplication.h" #include diff --git a/tests/src/Mod/PartDesign/App/ShapeBinder.cpp b/tests/src/Mod/PartDesign/App/ShapeBinder.cpp index 5d3a60a738..52768ae160 100644 --- a/tests/src/Mod/PartDesign/App/ShapeBinder.cpp +++ b/tests/src/Mod/PartDesign/App/ShapeBinder.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "src/App/InitApplication.h" #include diff --git a/tests/src/Mod/Points/App/Points.cpp b/tests/src/Mod/Points/App/Points.cpp index 26e48a986d..452e160ae2 100644 --- a/tests/src/Mod/Points/App/Points.cpp +++ b/tests/src/Mod/Points/App/Points.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include #include diff --git a/tests/src/Mod/Sketcher/App/SketchObject.cpp b/tests/src/Mod/Sketcher/App/SketchObject.cpp index 92d396452c..e02e891bda 100644 --- a/tests/src/Mod/Sketcher/App/SketchObject.cpp +++ b/tests/src/Mod/Sketcher/App/SketchObject.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include diff --git a/tests/src/Mod/Sketcher/App/planegcs/Constraints.cpp b/tests/src/Mod/Sketcher/App/planegcs/Constraints.cpp index e113732b86..4f0b90b997 100644 --- a/tests/src/Mod/Sketcher/App/planegcs/Constraints.cpp +++ b/tests/src/Mod/Sketcher/App/planegcs/Constraints.cpp @@ -2,7 +2,7 @@ #include -#include "gtest/gtest.h" +#include #include "Mod/Sketcher/App/planegcs/GCS.h" #include "Mod/Sketcher/App/planegcs/Geo.h" diff --git a/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp b/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp index 51fcdef592..967452c927 100644 --- a/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp +++ b/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -#include "gtest/gtest.h" +#include #include "Mod/Sketcher/App/planegcs/GCS.h" diff --git a/tests/src/zipios++/collectioncollection.cpp b/tests/src/zipios++/collectioncollection.cpp index 2bf0602800..a2168cea7f 100644 --- a/tests/src/zipios++/collectioncollection.cpp +++ b/tests/src/zipios++/collectioncollection.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include diff --git a/tests/src/zipios++/zipfile.cpp b/tests/src/zipios++/zipfile.cpp index c1557d448c..62095337b3 100644 --- a/tests/src/zipios++/zipfile.cpp +++ b/tests/src/zipios++/zipfile.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include #include #include #include