kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot]
2023-12-23 12:29:32 +00:00
parent 9e669e4d7a
commit 5e6f36329a
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/src/Mod/Part/App/FeatureFillet.cpp
View File

@@ -6,9 +6,11 @@
#include "PartTestHelpers.h"
std::vector<Part::FilletElement> _getFilletEdges(std::vector<int> edges = {1,2}, double startRadius = 0.3, double endRadius = 0.3) {
std::vector<Part::FilletElement>
_getFilletEdges(std::vector<int> edges = {1, 2}, double startRadius = 0.3, double endRadius = 0.3)
{
std::vector<Part::FilletElement> 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<const char*> 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();

16
tests/src/Mod/Part/App/FeaturePartCommon.cpp
View File

@@ -164,10 +164,18 @@ TEST_F(FeaturePartCommonTest, testHistory)
// Manually create the histories classically generated by FreeCAD for comparison
using MapList = std::map<int, std::vector<int>>;
using List = std::vector<int>;
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<Part::ShapeHistory> hist = _common->History.getValues();

2
tests/src/Mod/Part/App/FeaturePartCut.cpp
View File

@@ -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)

2
tests/src/Mod/Part/App/FeaturePartFuse.cpp
View File

@@ -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();