diff --git a/tests/src/Mod/Part/App/FeaturePartCommon.cpp b/tests/src/Mod/Part/App/FeaturePartCommon.cpp index c9aa1c2c36..fa8616a6e9 100644 --- a/tests/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCommon.cpp @@ -25,7 +25,8 @@ protected: } - void SetUp() override { + void SetUp() override + { _docName = App::GetApplication().getUniqueDocumentName("test"); _doc = App::GetApplication().newDocument(_docName.c_str(), "testUser"); _box1obj = static_cast(_doc->addObject("Part::Box")); @@ -37,39 +38,48 @@ protected: _box1obj->Length.setValue(1); _box1obj->Width.setValue(2); _box1obj->Height.setValue(3); - _box1obj->Placement.setValue(Base::Placement(Base::Vector3d(), Base::Rotation(), Base::Vector3d())); - _box2obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 1, 0), Base::Rotation(), Base::Vector3d())); + _box1obj->Placement.setValue( + Base::Placement(Base::Vector3d(), Base::Rotation(), Base::Vector3d())); + _box2obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 1, 0), Base::Rotation(), Base::Vector3d())); _box2obj->Length.setValue(1); _box2obj->Width.setValue(2); _box2obj->Height.setValue(3); - _box3obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 3, 0), Base::Rotation(), Base::Vector3d())); + _box3obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 3, 0), Base::Rotation(), Base::Vector3d())); _box3obj->Length.setValue(1); _box3obj->Width.setValue(2); _box3obj->Height.setValue(3); - _box4obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2, 0), Base::Rotation(), Base::Vector3d())); + _box4obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2, 0), Base::Rotation(), Base::Vector3d())); _box4obj->Length.setValue(1); _box4obj->Width.setValue(2); _box4obj->Height.setValue(3); - _box5obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2 + Base::Precision::Confusion(), 0), Base::Rotation(), Base::Vector3d())); + _box5obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2 + Base::Precision::Confusion(), 0), + Base::Rotation(), + Base::Vector3d())); _box5obj->Length.setValue(1); _box5obj->Width.setValue(2); _box5obj->Height.setValue(3); - _box6obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2 - Base::Precision::Confusion()*1000, 0), Base::Rotation(), Base::Vector3d())); + _box6obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2 - Base::Precision::Confusion() * 1000, 0), + Base::Rotation(), + Base::Vector3d())); _box6obj->Length.setValue(1); _box6obj->Width.setValue(2); _box6obj->Height.setValue(3); - _common = - static_cast(_doc->addObject("Part::Common")); + _common = static_cast(_doc->addObject("Part::Common")); } - void TearDown() override { - - } + void TearDown() override + {} Part::Box *_box1obj, *_box2obj, *_box3obj, *_box4obj, *_box5obj, *_box6obj; - Part::Common *_common; - App::Document *_doc; + Part::Common* _common; + App::Document* _doc; + private: std::string _docName; }; @@ -86,12 +96,12 @@ TEST_F(FeaturePartCommonTest, testIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_EQ(bb.MinX, 0 ); - EXPECT_EQ(bb.MinY, 1 ); - EXPECT_EQ(bb.MinZ, 0 ); - EXPECT_EQ(bb.MaxX, 1 ); - EXPECT_EQ(bb.MaxY, 2 ); - EXPECT_EQ(bb.MaxZ, 3 ); + EXPECT_EQ(bb.MinX, 0); + EXPECT_EQ(bb.MinY, 1); + EXPECT_EQ(bb.MinZ, 0); + EXPECT_EQ(bb.MaxX, 1); + EXPECT_EQ(bb.MaxY, 2); + EXPECT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCommonTest, testNonIntersecting) @@ -156,12 +166,12 @@ TEST_F(FeaturePartCommonTest, testBarelyIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_EQ(bb.MinX, 0 ); - EXPECT_EQ(bb.MinY, 1.9999 ); - EXPECT_EQ(bb.MinZ, 0 ); - EXPECT_EQ(bb.MaxX, 1 ); - EXPECT_EQ(bb.MaxY, 2 ); - EXPECT_EQ(bb.MaxZ, 3 ); + EXPECT_EQ(bb.MinX, 0); + EXPECT_EQ(bb.MinY, 1.9999); + EXPECT_EQ(bb.MinZ, 0); + EXPECT_EQ(bb.MaxX, 1); + EXPECT_EQ(bb.MaxY, 2); + EXPECT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCommonTest, testMustExecute) @@ -190,25 +200,30 @@ TEST_F(FeaturePartCommonTest, testGetProviderName) // Act _common->execute(); - const char * name = _common->getViewProviderName(); + const char* name = _common->getViewProviderName(); // Assert - EXPECT_STREQ(name,"PartGui::ViewProviderBoolean"); + EXPECT_STREQ(name, "PartGui::ViewProviderBoolean"); } -namespace Part { - void PrintTo(ShapeHistory sh, std::ostream* os) { - const char *types[] = { "Compound", "CompSolid", "Solid", "Shell", "Face", "Wire", "Edge", "Vertex", "Shape" }; - *os << "History for " << types[sh.type] << " is "; - for (const auto & it : sh.shapeMap) { - int old_shape_index = it.first; - *os << " " << old_shape_index << ": "; - if (! it.second.empty()) - for ( auto it2 : it.second) - *os << it2 << " "; +namespace Part +{ +void PrintTo(ShapeHistory sh, std::ostream* os) +{ + const char* types[] = + {"Compound", "CompSolid", "Solid", "Shell", "Face", "Wire", "Edge", "Vertex", "Shape"}; + *os << "History for " << types[sh.type] << " is "; + for (const auto& it : sh.shapeMap) { + int old_shape_index = it.first; + *os << " " << old_shape_index << ": "; + if (!it.second.empty()) { + for (auto it2 : it.second) { + *os << it2 << " "; + } } - *os << std::endl; } + *os << std::endl; } +} // namespace Part TEST_F(FeaturePartCommonTest, testHistory) { @@ -218,25 +233,27 @@ TEST_F(FeaturePartCommonTest, testHistory) // Act and Assert std::vector hist = _common->History.getValues(); - EXPECT_EQ(hist.size(),0); + EXPECT_EQ(hist.size(), 0); // This creates the histories classically generated by FreeCAD for comparison - using MapList = std::map >; + 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}} }; - MapList compare2 = { {0, List{0}}, {1, List{5}}, {2, List{4}}, {3, List()}, {4, List{3}}, {5, List{1}} }; + MapList compare1 = + {{0, List {0}}, {1, List {5}}, {2, List()}, {3, List {2}}, {4, List {3}}, {5, List {1}}}; + MapList compare2 = + {{0, List {0}}, {1, List {5}}, {2, List {4}}, {3, List()}, {4, List {3}}, {5, List {1}}}; _common->execute(); hist = _common->History.getValues(); - EXPECT_EQ(hist.size(),2); - EXPECT_EQ(hist[0].shapeMap,compare1); - EXPECT_EQ(hist[1].shapeMap,compare2); + EXPECT_EQ(hist.size(), 2); + EXPECT_EQ(hist[0].shapeMap, compare1); + EXPECT_EQ(hist[1].shapeMap, compare2); _common->Base.setValue(_box2obj); _common->Tool.setValue(_box1obj); _common->execute(); hist = _common->History.getValues(); // std::cout << testing::PrintToString(hist[0]) << testing::PrintToString(hist[1]); - EXPECT_EQ(hist.size(),2); - EXPECT_EQ(hist[1].shapeMap,compare1); - EXPECT_EQ(hist[0].shapeMap,compare2); + EXPECT_EQ(hist.size(), 2); + EXPECT_EQ(hist[1].shapeMap, compare1); + EXPECT_EQ(hist[0].shapeMap, compare2); } diff --git a/tests/src/Mod/Part/App/FeaturePartCut.cpp b/tests/src/Mod/Part/App/FeaturePartCut.cpp index 748a7a6d15..5f2e8fbee4 100644 --- a/tests/src/Mod/Part/App/FeaturePartCut.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCut.cpp @@ -25,57 +25,61 @@ protected: } - void SetUp() override { + void SetUp() override + { _docName = App::GetApplication().getUniqueDocumentName("test"); _doc = App::GetApplication().newDocument(_docName.c_str(), "testUser"); - _box1obj = - static_cast(_doc->addObject("Part::Box")); + _box1obj = static_cast(_doc->addObject("Part::Box")); _box1obj->Length.setValue(1); _box1obj->Width.setValue(2); _box1obj->Height.setValue(3); - _box1obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 0, 0), Base::Rotation(), Base::Vector3d(0,0,0))); - _box2obj = - static_cast(_doc->addObject("Part::Box")); - _box2obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 1, 0), Base::Rotation(), Base::Vector3d(0,0,0))); + _box1obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 0, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); + _box2obj = static_cast(_doc->addObject("Part::Box")); + _box2obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 1, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); _box2obj->Length.setValue(1); _box2obj->Width.setValue(2); _box2obj->Height.setValue(3); - _box3obj = - static_cast(_doc->addObject("Part::Box")); - _box3obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 3, 0), Base::Rotation(), Base::Vector3d(0,0,0))); + _box3obj = static_cast(_doc->addObject("Part::Box")); + _box3obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 3, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); _box3obj->Length.setValue(1); _box3obj->Width.setValue(2); _box3obj->Height.setValue(3); - _box4obj = - static_cast(_doc->addObject("Part::Box")); - _box4obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2, 0), Base::Rotation(), Base::Vector3d(0,0,0))); + _box4obj = static_cast(_doc->addObject("Part::Box")); + _box4obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); _box4obj->Length.setValue(1); _box4obj->Width.setValue(2); _box4obj->Height.setValue(3); - _box5obj = - static_cast(_doc->addObject("Part::Box")); - _box5obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2 + Base::Precision::Confusion(), 0), Base::Rotation(), Base::Vector3d())); + _box5obj = static_cast(_doc->addObject("Part::Box")); + _box5obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2 + Base::Precision::Confusion(), 0), + Base::Rotation(), + Base::Vector3d())); _box5obj->Length.setValue(1); _box5obj->Width.setValue(2); _box5obj->Height.setValue(3); - _box6obj = - static_cast(_doc->addObject("Part::Box")); - _box6obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2 - Base::Precision::Confusion()*1000, 0), Base::Rotation(), Base::Vector3d())); + _box6obj = static_cast(_doc->addObject("Part::Box")); + _box6obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2 - Base::Precision::Confusion() * 1000, 0), + Base::Rotation(), + Base::Vector3d())); _box6obj->Length.setValue(1); _box6obj->Width.setValue(2); _box6obj->Height.setValue(3); - _cut = - static_cast(_doc->addObject("Part::Cut")); + _cut = static_cast(_doc->addObject("Part::Cut")); } - void TearDown() override { - - } + void TearDown() override + {} Part::Box *_box1obj, *_box2obj, *_box3obj, *_box4obj, *_box5obj, *_box6obj; - Part::Cut *_cut; - App::Document *_doc; + Part::Cut* _cut; + App::Document* _doc; + private: std::string _docName; }; @@ -92,12 +96,12 @@ TEST_F(FeaturePartCutTest, testIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_EQ(bb.MinX, 0 ); - EXPECT_EQ(bb.MinY, 0 ); - EXPECT_EQ(bb.MinZ, 0 ); - EXPECT_EQ(bb.MaxX, 1 ); - EXPECT_EQ(bb.MaxY, 1 ); - EXPECT_EQ(bb.MaxZ, 3 ); + EXPECT_EQ(bb.MinX, 0); + EXPECT_EQ(bb.MinY, 0); + EXPECT_EQ(bb.MinZ, 0); + EXPECT_EQ(bb.MaxX, 1); + EXPECT_EQ(bb.MaxY, 1); + EXPECT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testNonIntersecting) @@ -112,12 +116,12 @@ TEST_F(FeaturePartCutTest, testNonIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_EQ(bb.MinX, 0 ); - EXPECT_EQ(bb.MinY, 0 ); - EXPECT_EQ(bb.MinZ, 0 ); - EXPECT_EQ(bb.MaxX, 1 ); - EXPECT_EQ(bb.MaxY, 2 ); - EXPECT_EQ(bb.MaxZ, 3 ); + EXPECT_EQ(bb.MinX, 0); + EXPECT_EQ(bb.MinY, 0); + EXPECT_EQ(bb.MinZ, 0); + EXPECT_EQ(bb.MaxX, 1); + EXPECT_EQ(bb.MaxY, 2); + EXPECT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testTouching) @@ -132,12 +136,12 @@ TEST_F(FeaturePartCutTest, testTouching) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_EQ(bb.MinX, 0 ); - EXPECT_EQ(bb.MinY, 0 ); - EXPECT_EQ(bb.MinZ, 0 ); - EXPECT_EQ(bb.MaxX, 1 ); - EXPECT_EQ(bb.MaxY, 2 ); - EXPECT_EQ(bb.MaxZ, 3 ); + EXPECT_EQ(bb.MinX, 0); + EXPECT_EQ(bb.MinY, 0); + EXPECT_EQ(bb.MinZ, 0); + EXPECT_EQ(bb.MaxX, 1); + EXPECT_EQ(bb.MaxY, 2); + EXPECT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testAlmostTouching) @@ -152,12 +156,12 @@ TEST_F(FeaturePartCutTest, testAlmostTouching) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_EQ(bb.MinX, 0 ); - EXPECT_EQ(bb.MinY, 0 ); - EXPECT_EQ(bb.MinZ, 0 ); - EXPECT_EQ(bb.MaxX, 1 ); - EXPECT_EQ(bb.MaxY, 2 ); - EXPECT_EQ(bb.MaxZ, 3 ); + EXPECT_EQ(bb.MinX, 0); + EXPECT_EQ(bb.MinY, 0); + EXPECT_EQ(bb.MinZ, 0); + EXPECT_EQ(bb.MaxX, 1); + EXPECT_EQ(bb.MaxY, 2); + EXPECT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testBarelyIntersecting) @@ -172,12 +176,12 @@ TEST_F(FeaturePartCutTest, testBarelyIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_EQ(bb.MinX, 0 ); - EXPECT_EQ(bb.MinY, 0 ); - EXPECT_EQ(bb.MinZ, 0 ); - EXPECT_EQ(bb.MaxX, 1 ); - EXPECT_EQ(bb.MaxY, 1.9999 ); - EXPECT_EQ(bb.MaxZ, 3 ); + EXPECT_EQ(bb.MinX, 0); + EXPECT_EQ(bb.MinY, 0); + EXPECT_EQ(bb.MinZ, 0); + EXPECT_EQ(bb.MaxX, 1); + EXPECT_EQ(bb.MaxY, 1.9999); + EXPECT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testMustExecute) @@ -206,7 +210,7 @@ TEST_F(FeaturePartCutTest, testGetProviderName) // Act _cut->execute(); - const char * name = _cut->getViewProviderName(); + const char* name = _cut->getViewProviderName(); // Assert - EXPECT_STREQ(name,"PartGui::ViewProviderBoolean"); + EXPECT_STREQ(name, "PartGui::ViewProviderBoolean"); } diff --git a/tests/src/Mod/Part/App/FeaturePartFuse.cpp b/tests/src/Mod/Part/App/FeaturePartFuse.cpp index 20818dcee5..b8025ac5cd 100644 --- a/tests/src/Mod/Part/App/FeaturePartFuse.cpp +++ b/tests/src/Mod/Part/App/FeaturePartFuse.cpp @@ -25,57 +25,61 @@ protected: } - void SetUp() override { + void SetUp() override + { _docName = App::GetApplication().getUniqueDocumentName("test"); _doc = App::GetApplication().newDocument(_docName.c_str(), "testUser"); - _box1obj = - static_cast(_doc->addObject("Part::Box")); + _box1obj = static_cast(_doc->addObject("Part::Box")); _box1obj->Length.setValue(1); _box1obj->Width.setValue(2); _box1obj->Height.setValue(3); - _box1obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 0, 0), Base::Rotation(), Base::Vector3d(0,0,0))); - _box2obj = - static_cast(_doc->addObject("Part::Box")); - _box2obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 1, 0), Base::Rotation(), Base::Vector3d(0,0,0))); + _box1obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 0, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); + _box2obj = static_cast(_doc->addObject("Part::Box")); + _box2obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 1, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); _box2obj->Length.setValue(1); _box2obj->Width.setValue(2); _box2obj->Height.setValue(3); - _box3obj = - static_cast(_doc->addObject("Part::Box")); - _box3obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 3, 0), Base::Rotation(), Base::Vector3d(0,0,0))); + _box3obj = static_cast(_doc->addObject("Part::Box")); + _box3obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 3, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); _box3obj->Length.setValue(1); _box3obj->Width.setValue(2); _box3obj->Height.setValue(3); - _box4obj = - static_cast(_doc->addObject("Part::Box")); - _box4obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2, 0), Base::Rotation(), Base::Vector3d(0,0,0))); + _box4obj = static_cast(_doc->addObject("Part::Box")); + _box4obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2, 0), Base::Rotation(), Base::Vector3d(0, 0, 0))); _box4obj->Length.setValue(1); _box4obj->Width.setValue(2); _box4obj->Height.setValue(3); - _box5obj = - static_cast(_doc->addObject("Part::Box")); - _box5obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2 + Base::Precision::Confusion(), 0), Base::Rotation(), Base::Vector3d())); + _box5obj = static_cast(_doc->addObject("Part::Box")); + _box5obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2 + Base::Precision::Confusion(), 0), + Base::Rotation(), + Base::Vector3d())); _box5obj->Length.setValue(1); _box5obj->Width.setValue(2); _box5obj->Height.setValue(3); - _box6obj = - static_cast(_doc->addObject("Part::Box")); - _box6obj->Placement.setValue(Base::Placement(Base::Vector3d(0, 2 - Base::Precision::Confusion()*1000, 0), Base::Rotation(), Base::Vector3d())); + _box6obj = static_cast(_doc->addObject("Part::Box")); + _box6obj->Placement.setValue( + Base::Placement(Base::Vector3d(0, 2 - Base::Precision::Confusion() * 1000, 0), + Base::Rotation(), + Base::Vector3d())); _box6obj->Length.setValue(1); _box6obj->Width.setValue(2); _box6obj->Height.setValue(3); - _fuse = - static_cast(_doc->addObject("Part::Fuse")); + _fuse = static_cast(_doc->addObject("Part::Fuse")); } - void TearDown() override { - - } + void TearDown() override + {} Part::Box *_box1obj, *_box2obj, *_box3obj, *_box4obj, *_box5obj, *_box6obj; - Part::Fuse *_fuse; - App::Document *_doc; + Part::Fuse* _fuse; + App::Document* _doc; + private: std::string _docName; }; @@ -92,12 +96,12 @@ TEST_F(FeaturePartFuseTest, testIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_FLOAT_EQ(bb.MinX, 0 ); - EXPECT_FLOAT_EQ(bb.MinY, 0 ); - EXPECT_FLOAT_EQ(bb.MinZ, 0 ); - EXPECT_FLOAT_EQ(bb.MaxX, 1 ); - EXPECT_FLOAT_EQ(bb.MaxY, 3 ); - EXPECT_FLOAT_EQ(bb.MaxZ, 3 ); + EXPECT_FLOAT_EQ(bb.MinX, 0); + EXPECT_FLOAT_EQ(bb.MinY, 0); + EXPECT_FLOAT_EQ(bb.MinZ, 0); + EXPECT_FLOAT_EQ(bb.MaxX, 1); + EXPECT_FLOAT_EQ(bb.MaxY, 3); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartFuseTest, testNonIntersecting) @@ -112,12 +116,12 @@ TEST_F(FeaturePartFuseTest, testNonIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_FLOAT_EQ(bb.MinX, 0 ); - EXPECT_FLOAT_EQ(bb.MinY, 0 ); - EXPECT_FLOAT_EQ(bb.MinZ, 0 ); - EXPECT_FLOAT_EQ(bb.MaxX, 1 ); - EXPECT_FLOAT_EQ(bb.MaxY, 5 ); - EXPECT_FLOAT_EQ(bb.MaxZ, 3 ); + EXPECT_FLOAT_EQ(bb.MinX, 0); + EXPECT_FLOAT_EQ(bb.MinY, 0); + EXPECT_FLOAT_EQ(bb.MinZ, 0); + EXPECT_FLOAT_EQ(bb.MaxX, 1); + EXPECT_FLOAT_EQ(bb.MaxY, 5); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartFuseTest, testTouching) @@ -132,12 +136,12 @@ TEST_F(FeaturePartFuseTest, testTouching) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_FLOAT_EQ(bb.MinX, 0 ); - EXPECT_FLOAT_EQ(bb.MinY, 0 ); - EXPECT_FLOAT_EQ(bb.MinZ, 0 ); - EXPECT_FLOAT_EQ(bb.MaxX, 1 ); - EXPECT_FLOAT_EQ(bb.MaxY, 4 ); - EXPECT_FLOAT_EQ(bb.MaxZ, 3 ); + EXPECT_FLOAT_EQ(bb.MinX, 0); + EXPECT_FLOAT_EQ(bb.MinY, 0); + EXPECT_FLOAT_EQ(bb.MinZ, 0); + EXPECT_FLOAT_EQ(bb.MaxX, 1); + EXPECT_FLOAT_EQ(bb.MaxY, 4); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartFuseTest, testAlmostTouching) @@ -152,12 +156,12 @@ TEST_F(FeaturePartFuseTest, testAlmostTouching) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_FLOAT_EQ(bb.MinX, 0 ); - EXPECT_FLOAT_EQ(bb.MinY, 0 ); - EXPECT_FLOAT_EQ(bb.MinZ, 0 ); - EXPECT_FLOAT_EQ(bb.MaxX, 1 ); - EXPECT_FLOAT_EQ(bb.MaxY, 4 ); - EXPECT_FLOAT_EQ(bb.MaxZ, 3 ); + EXPECT_FLOAT_EQ(bb.MinX, 0); + EXPECT_FLOAT_EQ(bb.MinY, 0); + EXPECT_FLOAT_EQ(bb.MinZ, 0); + EXPECT_FLOAT_EQ(bb.MaxX, 1); + EXPECT_FLOAT_EQ(bb.MaxY, 4); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartFuseTest, testBarelyIntersecting) @@ -172,12 +176,12 @@ TEST_F(FeaturePartFuseTest, testBarelyIntersecting) Base::BoundBox3d bb = ts.getBoundBox(); // Assert - EXPECT_FLOAT_EQ(bb.MinX, 0 ); - EXPECT_FLOAT_EQ(bb.MinY, 0 ); - EXPECT_FLOAT_EQ(bb.MinZ, 0 ); - EXPECT_FLOAT_EQ(bb.MaxX, 1 ); - EXPECT_FLOAT_EQ(bb.MaxY, 3.9999 ); - EXPECT_FLOAT_EQ(bb.MaxZ, 3 ); + EXPECT_FLOAT_EQ(bb.MinX, 0); + EXPECT_FLOAT_EQ(bb.MinY, 0); + EXPECT_FLOAT_EQ(bb.MinZ, 0); + EXPECT_FLOAT_EQ(bb.MaxX, 1); + EXPECT_FLOAT_EQ(bb.MaxY, 3.9999); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartFuseTest, testMustExecute) @@ -206,9 +210,9 @@ TEST_F(FeaturePartFuseTest, testGetProviderName) // Act _fuse->execute(); - const char * name = _fuse->getViewProviderName(); + const char* name = _fuse->getViewProviderName(); // Assert - EXPECT_STREQ(name,"PartGui::ViewProviderBoolean"); + EXPECT_STREQ(name, "PartGui::ViewProviderBoolean"); } TEST_F(FeaturePartFuseTest, testRefine)