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

Part/Toponaming: use TopoShape::getShape() in PartFeatures.cpp tests and TopoShapeMakeElementRefine.cpp tests

Browse Source 
* Replace TopoShape::getValue() with TopoShape::getShape() to test the size of element maps
 * Update the expected values

Signed-off-by: CalligaroV <vincenzo.calligaro@gmail.com>
This commit is contained in:
CalligaroV
2024-08-08 01:09:52 +02:00
committed by Chris Hennes
parent 1afe48140d
commit cbbc08fc47
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/src/Mod/Part/App/PartFeatures.cpp
View File

@@ -49,7 +49,7 @@ TEST_F(PartFeaturesTest, testRuledSurface)
_ruled->Curve2.setValue(_edge2);
// Act
_ruled->execute();
TopoShape ts = _ruled->Shape.getValue();
TopoShape ts = _ruled->Shape.getShape();
double volume = getVolume(ts.getShape());
double area = getArea(ts.getShape());
Base::BoundBox3d bb = ts.getBoundBox();
@@ -59,7 +59,7 @@ TEST_F(PartFeaturesTest, testRuledSurface)
EXPECT_DOUBLE_EQ(area, 4.0);
EXPECT_TRUE(boxesMatch(bb, Base::BoundBox3d(0, 0, 0, 2, 2, 0)));
// Assert element map is correct
EXPECT_EQ(0, elementMap.size()); // TODO: Expect this to be non-zero when TNP on
EXPECT_EQ(9, elementMap.size());
}
TEST_F(PartFeaturesTest, testLoft)
@@ -77,7 +77,7 @@ TEST_F(PartFeaturesTest, testLoft)
_loft->Solid.setValue((true));
// Act
_loft->execute();
TopoShape ts = _loft->Shape.getValue();
TopoShape ts = _loft->Shape.getShape();
double volume = getVolume(ts.getShape());
double area = getArea(ts.getShape());
Base::BoundBox3d bb = ts.getBoundBox();
@@ -87,7 +87,7 @@ TEST_F(PartFeaturesTest, testLoft)
EXPECT_DOUBLE_EQ(area, 64.0);
EXPECT_TRUE(boxesMatch(bb, Base::BoundBox3d(0, 0, 0, 4, 4, 2)));
// Assert element map is correct
EXPECT_EQ(0, elementMap.size()); // TODO: Expect this to be non-zero when TNP on
EXPECT_EQ(26, elementMap.size());
}
TEST_F(PartFeaturesTest, testSweep)
@@ -108,7 +108,7 @@ TEST_F(PartFeaturesTest, testSweep)
_sweep->Spine.setValue(_edge1);
// Act
_sweep->execute();
TopoShape ts = _sweep->Shape.getValue();
TopoShape ts = _sweep->Shape.getShape();
double volume = getVolume(ts.getShape());
double area = getArea(ts.getShape());
Base::BoundBox3d bb = ts.getBoundBox();
@@ -118,7 +118,7 @@ TEST_F(PartFeaturesTest, testSweep)
EXPECT_DOUBLE_EQ(area, 48.0);
EXPECT_TRUE(boxesMatch(bb, Base::BoundBox3d(0, 0, 0, 4, 4, 3)));
// Assert element map is correct
EXPECT_EQ(0, elementMap.size()); // TODO: Expect this to be non-zero when TNP on
EXPECT_EQ(24, elementMap.size());
}
TEST_F(PartFeaturesTest, testThickness)
@@ -130,7 +130,7 @@ TEST_F(PartFeaturesTest, testThickness)
_thickness->Join.setValue("Intersection");
// Act
_thickness->execute();
TopoShape ts = _thickness->Shape.getValue();
TopoShape ts = _thickness->Shape.getShape();
double volume = getVolume(ts.getShape());
double area = getArea(ts.getShape());
Base::BoundBox3d bb = ts.getBoundBox();
@@ -140,7 +140,7 @@ TEST_F(PartFeaturesTest, testThickness)
EXPECT_DOUBLE_EQ(area, 42.5);
EXPECT_TRUE(boxesMatch(bb, Base::BoundBox3d(0, -0.25, -0.25, 1.25, 2.25, 3.25)));
// Assert element map is correct
EXPECT_EQ(0, elementMap.size()); // TODO: Expect this to be non-zero when TNP on
EXPECT_EQ(51, elementMap.size());
}
TEST_F(PartFeaturesTest, testRefine)
@@ -150,12 +150,12 @@ TEST_F(PartFeaturesTest, testRefine)
_fuse->Base.setValue(_boxes[0]);
_fuse->Tool.setValue(_boxes[3]);
_fuse->execute();
Part::TopoShape fusedts = _fuse->Shape.getValue();
Part::TopoShape fusedts = _fuse->Shape.getShape();
auto _refine = dynamic_cast<Refine*>(_doc->addObject("Part::Refine"));
_refine->Source.setValue(_fuse);
// Act
_refine->execute();
TopoShape ts = _refine->Shape.getValue();
TopoShape ts = _refine->Shape.getShape();
double volume = getVolume(ts.getShape());
double area = getArea(ts.getShape());
Base::BoundBox3d bb = ts.getBoundBox();
@@ -179,7 +179,7 @@ TEST_F(PartFeaturesTest, testReverse)
_reverse->Source.setValue(_boxes[0]);
// Act
_reverse->execute();
TopoShape ts = _reverse->Shape.getValue();
TopoShape ts = _reverse->Shape.getShape();
double volume = getVolume(ts.getShape());
double area = getArea(ts.getShape());
Base::BoundBox3d bb = ts.getBoundBox();

6
tests/src/Mod/Part/App/TopoShapeMakeElementRefine.cpp
View File

@@ -34,7 +34,7 @@ TEST_F(FeaturePartMakeElementRefineTest, makeElementRefineBoxes)
_fuse->Tool.setValue(_boxes[3]);
// Act
_fuse->execute();
Part::TopoShape ts = _fuse->Shape.getValue();
Part::TopoShape ts = _fuse->Shape.getShape();
Part::TopoShape refined = ts.makeElementRefine();
double volume = PartTestHelpers::getVolume(ts.getShape());
double refinedVolume = PartTestHelpers::getVolume(refined.getShape());
@@ -47,7 +47,9 @@ TEST_F(FeaturePartMakeElementRefineTest, makeElementRefineBoxes)
EXPECT_EQ(ts.countSubElements("Edge"), 20); // Two boxes touching loose 4 edges
EXPECT_EQ(refined.countSubElements("Face"), 6); // After refining it is one box
EXPECT_EQ(refined.countSubElements("Edge"), 12); // 12 edges in a box
// TODO: Make sure we have an elementMap for the refine.
// Make sure that the number of elements in the elementMaps is correct.
EXPECT_EQ(ts.getElementMapSize(), 42);
EXPECT_EQ(refined.getElementMapSize(), 26);
// TODO: Refine doesn't work on compounds, so we're going to need a binary operation or the
// like, and those don't exist yet. Once they do, this test can be expanded
}