Skip to content

Commit f6f345a

Browse files
N-Dekkerdzenanz
authored andcommitted
BUG: Remove MakePoint, MakeVector and other Make calls from GoogleTest
The MakePoint and MakeVector calls in itkGoogleTest always return a Point or Vector whose ValueType is 64-bit `double`. This causes test failures when SpacePrecisionType is a 32-bit `float` (when `ITK_USE_FLOAT_SPACE_PRECISION` is enabled). As was observed by Dženan Zukić. This commit removed these calls, as well as calls to MakeIndex and MakeSize, because all of these functions have been moved from `itk::GTest` to the ITK Core already in July 2021, so they do not need to be tested by itkGoogleTest anymore. Follow-up to pull request InsightSoftwareConsortium#2644 commit 558ea67 "STYLE: Remove `Make` functions from itk::GTest::TypedefsAndConstructors"
1 parent 4927790 commit f6f345a

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

Modules/Core/TestKernel/test/itkGoogleTest.cxx

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,26 @@ TEST(GoogleTest, TypedefsAndConstructors_Dimension2)
3636
PointType pt1;
3737
pt1[0] = 1.1;
3838
pt1[1] = 2.2;
39-
const PointType pt2 = itk::MakePoint(1.1, 2.2);
39+
const auto pt2 = pt1;
4040
EXPECT_TRUE(pt1 == pt2);
4141
ITK_EXPECT_VECTOR_NEAR(pt1, pt2, 1e-10);
42-
ITK_EXPECT_VECTOR_NEAR(pt1, itk::MakePoint(1.1, 2.2), 1e-10);
4342

4443
VectorType vec1;
4544
vec1[0] = 1.1;
4645
vec1[1] = 2.2;
47-
const VectorType vec2 = itk::MakeVector(1.1, 2.2);
46+
const auto vec2 = vec1;
4847
EXPECT_TRUE(vec1 == vec2);
4948
ITK_EXPECT_VECTOR_NEAR(vec1, vec2, 1e-10);
50-
ITK_EXPECT_VECTOR_NEAR(vec1, itk::MakeVector(1.1, 2.2), 1e-10);
5149

5250
constexpr IndexType idx1{ 0, 1 };
53-
const IndexType idx2 = itk::MakeIndex(0, 1);
51+
constexpr auto idx2 = idx1;
5452
EXPECT_TRUE(idx1 == idx2);
5553
ITK_EXPECT_VECTOR_NEAR(idx1, idx2, 1e-10);
56-
ITK_EXPECT_VECTOR_NEAR(idx1, itk::MakeIndex(0, 1), 1e-10);
5754

5855
constexpr SizeType sz1{ 0u, 1u };
59-
const SizeType sz2 = itk::MakeSize(0u, 1u);
56+
constexpr auto sz2 = sz1;
6057
EXPECT_TRUE(sz1 == sz2);
6158
ITK_EXPECT_VECTOR_NEAR(sz1, sz2, 1e-10);
62-
ITK_EXPECT_VECTOR_NEAR(sz1, itk::MakeSize(0u, 1u), 1e-10);
6359
}
6460

6561

@@ -73,27 +69,24 @@ TEST(GoogleTest, TypedefsAndConstructors_Dimension3)
7369
pt1[0] = 1.1;
7470
pt1[1] = 2.2;
7571
pt1[2] = 3.3;
76-
const PointType pt2 = itk::MakePoint(1.1, 2.2, 3.3);
72+
const auto pt2 = pt1;
7773
EXPECT_TRUE(pt1 == pt2);
7874
ITK_EXPECT_VECTOR_NEAR(pt1, pt2, 1e-10);
79-
ITK_EXPECT_VECTOR_NEAR(pt1, itk::MakePoint(1.1, 2.2, 3.3), 1e-10);
8075

8176
VectorType vec1;
8277
vec1[0] = 1.1;
8378
vec1[1] = 2.2;
8479
vec1[2] = 3.3;
85-
const VectorType vec2 = itk::MakeVector(1.1, 2.2, 3.3);
80+
const auto vec2 = vec1;
8681
EXPECT_TRUE(vec1 == vec2);
8782
ITK_EXPECT_VECTOR_NEAR(vec1, vec2, 1e-10);
88-
ITK_EXPECT_VECTOR_NEAR(vec1, itk::MakeVector(1.1, 2.2, 3.3), 1e-10);
8983

9084
constexpr IndexType idx1{ 0, 1, 2 };
91-
const IndexType idx2 = itk::MakeIndex(0, 1, 2);
85+
constexpr auto idx2 = idx1;
9286
EXPECT_TRUE(idx1 == idx2);
9387
ITK_EXPECT_VECTOR_NEAR(idx1, idx2, 1e-10);
9488

9589
constexpr SizeType sz1{ 0u, 1u, 2u };
96-
const SizeType sz2 = itk::MakeSize(0u, 1u, 2u);
90+
constexpr auto sz2 = sz1;
9791
EXPECT_TRUE(sz1 == sz2);
98-
ITK_EXPECT_VECTOR_NEAR(sz1, itk::MakeSize(0u, 1u, 2u), 1e-10);
9992
}

0 commit comments

Comments
 (0)