From 5e6f36329a87160e80b7981da0efd3d70699bef2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 23 Dec 2023 12:29:32 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/src/Mod/Part/App/FeatureFillet.cpp | 38 ++++++++++---------- tests/src/Mod/Part/App/FeaturePartCommon.cpp | 16 ++++++--- tests/src/Mod/Part/App/FeaturePartCut.cpp | 2 +- tests/src/Mod/Part/App/FeaturePartFuse.cpp | 2 +- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/tests/src/Mod/Part/App/FeatureFillet.cpp b/tests/src/Mod/Part/App/FeatureFillet.cpp index 61289d4e7b..3d23e36cc3 100644 --- a/tests/src/Mod/Part/App/FeatureFillet.cpp +++ b/tests/src/Mod/Part/App/FeatureFillet.cpp @@ -6,9 +6,11 @@ #include "PartTestHelpers.h" -std::vector _getFilletEdges(std::vector edges = {1,2}, double startRadius = 0.3, double endRadius = 0.3) { +std::vector +_getFilletEdges(std::vector edges = {1, 2}, double startRadius = 0.3, double endRadius = 0.3) +{ std::vector filletElements; - for ( auto e : edges ) { + for (auto e : edges) { Part::FilletElement fe = {e, startRadius, endRadius}; filletElements.push_back(fe); } @@ -47,7 +49,7 @@ protected: void TearDown() override {} - Part::Fuse *_fused; + Part::Fuse* _fused; Part::Fillet* _fillet; }; @@ -55,39 +57,39 @@ TEST_F(FeatureFilletTest, testInner) { // Arrange _fillet->Base.setValue(_fused); - Part::TopoShape rf = _fused->Shape.getValue(); + Part::TopoShape rf = _fused->Shape.getValue(); std::vector get = rf.getElementTypes(); - ASSERT_EQ(get.size(),3); - EXPECT_STREQ(get[0],"Face"); - EXPECT_STREQ(get[1],"Edge"); - EXPECT_STREQ(get[2],"Vertex"); + ASSERT_EQ(get.size(), 3); + EXPECT_STREQ(get[0], "Face"); + EXPECT_STREQ(get[1], "Edge"); + EXPECT_STREQ(get[2], "Vertex"); unsigned long sec = rf.countSubElements("Edge"); - EXPECT_EQ(sec,25); + EXPECT_EQ(sec, 25); _fused->Refine.setValue(true); _fused->execute(); rf = _fused->Shape.getValue(); sec = rf.countSubElements("Edge"); - EXPECT_EQ(sec,24); + EXPECT_EQ(sec, 24); _fillet->Edges.setValues(_getFilletEdges()); // Act double volume; - - volume = PartTestHelpers::getVolume(_fused->Shape.getValue()); - EXPECT_DOUBLE_EQ(volume,126.0); - volume = PartTestHelpers::getVolume(_fillet->Shape.getValue()); - EXPECT_DOUBLE_EQ(volume,0.0); + + volume = PartTestHelpers::getVolume(_fused->Shape.getValue()); + EXPECT_DOUBLE_EQ(volume, 126.0); + volume = PartTestHelpers::getVolume(_fillet->Shape.getValue()); + EXPECT_DOUBLE_EQ(volume, 0.0); _fillet->execute(); - volume = PartTestHelpers::getVolume(_fillet->Shape.getValue()); - EXPECT_DOUBLE_EQ(volume,125.80944686460914); + volume = PartTestHelpers::getVolume(_fillet->Shape.getValue()); + EXPECT_DOUBLE_EQ(volume, 125.80944686460914); } TEST_F(FeatureFilletTest, testOuter) { // Arrange _fillet->Base.setValue(_fused); - _fillet->Edges.setValues(_getFilletEdges({3,4,5,6,7,8,9,10})); + _fillet->Edges.setValues(_getFilletEdges({3, 4, 5, 6, 7, 8, 9, 10})); // Act _fillet->execute(); diff --git a/tests/src/Mod/Part/App/FeaturePartCommon.cpp b/tests/src/Mod/Part/App/FeaturePartCommon.cpp index 6023eabfed..953f2f0dcf 100644 --- a/tests/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCommon.cpp @@ -164,10 +164,18 @@ TEST_F(FeaturePartCommonTest, testHistory) // Manually create the histories classically generated by FreeCAD for comparison using MapList = std::map>; using List = std::vector; - MapList compare1 = - {{0, List {0}}, {1, List {5}}, {2, List()}, {3, List {2}}, {4, List {3}}, {5, List {1}}}; // NOLINT magic number - MapList compare2 = - {{0, List {0}}, {1, List {5}}, {2, List {4}}, {3, List()}, {4, List {3}}, {5, List {1}}}; // NOLINT magic number + MapList compare1 = {{0, List {0}}, + {1, List {5}}, + {2, List()}, + {3, List {2}}, + {4, List {3}}, + {5, List {1}}}; // NOLINT magic number + MapList compare2 = {{0, List {0}}, + {1, List {5}}, + {2, List {4}}, + {3, List()}, + {4, List {3}}, + {5, List {1}}}; // NOLINT magic number // Act and Assert no histories yet std::vector hist = _common->History.getValues(); diff --git a/tests/src/Mod/Part/App/FeaturePartCut.cpp b/tests/src/Mod/Part/App/FeaturePartCut.cpp index 29276e4566..7699a70af2 100644 --- a/tests/src/Mod/Part/App/FeaturePartCut.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCut.cpp @@ -24,7 +24,7 @@ protected: void TearDown() override {} - Part::Cut* _cut; // NOLINT Can't be private in a test framework + Part::Cut* _cut; // NOLINT Can't be private in a test framework }; TEST_F(FeaturePartCutTest, testIntersecting) diff --git a/tests/src/Mod/Part/App/FeaturePartFuse.cpp b/tests/src/Mod/Part/App/FeaturePartFuse.cpp index bcfdb0bf36..33ae5e5bec 100644 --- a/tests/src/Mod/Part/App/FeaturePartFuse.cpp +++ b/tests/src/Mod/Part/App/FeaturePartFuse.cpp @@ -124,7 +124,7 @@ TEST_F(FeaturePartFuseTest, testBarelyIntersecting) { // Arrange _fuse->Base.setValue(_boxes[0]); - _fuse->Tool.setValue(_boxes[5]); // NOLINT magic number + _fuse->Tool.setValue(_boxes[5]); // NOLINT magic number // Act _fuse->execute();