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

Lint and other cleanups

Browse Source
This commit is contained in:
bgbsww
2024-01-18 11:46:15 -05:00
parent 0cb513f084
commit fae1cd569f
3 changed files with 222 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
tests/src/Mod/Part/App/TopoShapeMapper.cpp
View File

@@ -38,7 +38,50 @@ private:
std::string _docName;
};
TEST_F(TopoShapeMapperTest, shapeHasherTests)
TEST_F(TopoShapeMapperTest, shapeHasherSingle)
{
// Arrange
auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge();
Part::TopoShape topoShape {edge};
auto edge2 = BRepBuilderAPI_MakeEdge(gp_Pnt(1.0, 0.0, 0.0), gp_Pnt(1.0, 1.0, 0.0)).Edge();
Part::TopoShape topoShape2 {edge2};
struct Part::ShapeHasher hasher;
// Act
size_t hash1 = hasher(topoShape);
size_t hash2 = hasher(topoShape2);
size_t hash3 = hasher(edge);
size_t hash4 = hasher(edge2);
// Assert
EXPECT_EQ(hash1, hash3);
EXPECT_EQ(hash2, hash4);
EXPECT_NE(hash1, hash2);
}
TEST_F(TopoShapeMapperTest, shapeHasherDual)
{
// Arrange
auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge();
Part::TopoShape topoShape {edge};
auto edge2 = BRepBuilderAPI_MakeEdge(gp_Pnt(1.0, 0.0, 0.0), gp_Pnt(1.0, 1.0, 0.0)).Edge();
Part::TopoShape topoShape2 {edge2};
struct Part::ShapeHasher hasher;
// Act
size_t hash5 = hasher(topoShape, topoShape);
size_t hash6 = hasher(topoShape, topoShape2);
size_t hash7 = hasher(edge, edge);
size_t hash8 = hasher(edge, edge2);
// Assert
EXPECT_TRUE(hash5);
EXPECT_FALSE(hash6);
EXPECT_TRUE(hash7);
EXPECT_FALSE(hash8);
}
TEST_F(TopoShapeMapperTest, shapeHasherPair)
{
// Arrange
auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge();
@@ -52,40 +95,44 @@ TEST_F(TopoShapeMapperTest, shapeHasherTests)
struct Part::ShapeHasher hasher;
// Act
size_t hash1 = hasher(topoShape);
size_t hash2 = hasher(topoShape2);
size_t hash3 = hasher(edge);
size_t hash4 = hasher(edge2);
size_t hash5 = hasher(topoShape, topoShape);
size_t hash6 = hasher(topoShape, topoShape2);
size_t hash7 = hasher(edge, edge);
size_t hash8 = hasher(edge, edge2);
size_t hash9 = hasher(pair1);
size_t hash10 = hasher(pair2);
size_t hash11 = hasher(pair3);
size_t hash12 = hasher(pair4);
// Assert
EXPECT_EQ(hash9, hash11);
EXPECT_EQ(hash10, hash12);
EXPECT_NE(hash9, hash10);
}
TEST_F(TopoShapeMapperTest, shapeHasherPairs)
{
// Arrange
auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge();
Part::TopoShape topoShape {edge};
auto edge2 = BRepBuilderAPI_MakeEdge(gp_Pnt(1.0, 0.0, 0.0), gp_Pnt(1.0, 1.0, 0.0)).Edge();
Part::TopoShape topoShape2 {edge2};
std::pair<Part::TopoShape, Part::TopoShape> pair1(topoShape, topoShape2);
std::pair<Part::TopoShape, Part::TopoShape> pair2(topoShape, topoShape);
std::pair<TopoDS_Shape, TopoDS_Shape> pair3(edge, edge2);
std::pair<TopoDS_Shape, TopoDS_Shape> pair4(edge, edge);
struct Part::ShapeHasher hasher;
// Act
size_t hash13 = hasher(pair1, pair1);
size_t hash14 = hasher(pair1, pair2);
size_t hash15 = hasher(pair3, pair3);
size_t hash16 = hasher(pair3, pair4);
// Assert
EXPECT_EQ(hash1, hash3);
EXPECT_EQ(hash2, hash4);
EXPECT_NE(hash1, hash2);
EXPECT_TRUE(hash5);
EXPECT_FALSE(hash6);
EXPECT_TRUE(hash7);
EXPECT_FALSE(hash8);
EXPECT_EQ(hash9, hash11);
EXPECT_EQ(hash10, hash12);
EXPECT_NE(hash9, hash10);
EXPECT_TRUE(hash13);
EXPECT_FALSE(hash14);
EXPECT_TRUE(hash15);
EXPECT_FALSE(hash16);
}
TEST_F(TopoShapeMapperTest, shapeMapperTests)
{
// Arrange
@@ -97,8 +144,8 @@ TEST_F(TopoShapeMapperTest, shapeMapperTests)
// Act
auto e = topoShape1.getSubTopoShapes(TopAbs_EDGE);
mapper.populate(false, box1, {e[0], e[1], e[2], e[3]});
mapper.populate(true, box1, {e[4], e[5], e[6]});
mapper.populate(Part::MappingStatus::Modified, box1, {e[0], e[1], e[2], e[3]});
mapper.populate(Part::MappingStatus::Generated, box1, {e[4], e[5], e[6]});
std::vector<TopoDS_Shape> vec1 = mapper.modified(box1);
std::vector<TopoDS_Shape> vec2 = mapper.generated(box1);