From 4f384c41a2717fed576e0b26e9f69b7689bc7565 Mon Sep 17 00:00:00 2001 From: bgbsww Date: Thu, 21 Dec 2023 14:34:37 -0500 Subject: [PATCH] First pass cleanup of test code --- tests/src/Mod/Part/App/FeaturePartCommon.cpp | 4 -- tests/src/Mod/Part/App/FeaturePartCut.cpp | 62 ++++++++++---------- tests/src/Mod/Part/App/FeaturePartFuse.cpp | 2 - 3 files changed, 30 insertions(+), 38 deletions(-) diff --git a/tests/src/Mod/Part/App/FeaturePartCommon.cpp b/tests/src/Mod/Part/App/FeaturePartCommon.cpp index fa8616a6e9..82a0d0ec77 100644 --- a/tests/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCommon.cpp @@ -12,8 +12,6 @@ #include "Mod/Part/App/FeaturePartCommon.h" #include -// #include - // Should some of this go into a FeaturePartBoolean.cpp test suite? class FeaturePartCommonTest: public ::testing::Test @@ -196,8 +194,6 @@ TEST_F(FeaturePartCommonTest, testMustExecute) TEST_F(FeaturePartCommonTest, testGetProviderName) { - // Arrange - // Act _common->execute(); const char* name = _common->getViewProviderName(); diff --git a/tests/src/Mod/Part/App/FeaturePartCut.cpp b/tests/src/Mod/Part/App/FeaturePartCut.cpp index 5f2e8fbee4..260b0d6e0f 100644 --- a/tests/src/Mod/Part/App/FeaturePartCut.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCut.cpp @@ -96,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_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, 1); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testNonIntersecting) @@ -116,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_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, 2); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testTouching) @@ -136,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_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, 2); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testAlmostTouching) @@ -156,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_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, 2); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testBarelyIntersecting) @@ -176,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_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, 1.9999); + EXPECT_FLOAT_EQ(bb.MaxZ, 3); } TEST_F(FeaturePartCutTest, testMustExecute) @@ -206,8 +206,6 @@ TEST_F(FeaturePartCutTest, testMustExecute) TEST_F(FeaturePartCutTest, testGetProviderName) { - // Arrange - // Act _cut->execute(); const char* name = _cut->getViewProviderName(); diff --git a/tests/src/Mod/Part/App/FeaturePartFuse.cpp b/tests/src/Mod/Part/App/FeaturePartFuse.cpp index b8025ac5cd..da60adfaca 100644 --- a/tests/src/Mod/Part/App/FeaturePartFuse.cpp +++ b/tests/src/Mod/Part/App/FeaturePartFuse.cpp @@ -206,8 +206,6 @@ TEST_F(FeaturePartFuseTest, testMustExecute) TEST_F(FeaturePartFuseTest, testGetProviderName) { - // Arrange - // Act _fuse->execute(); const char* name = _fuse->getViewProviderName();