diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp index 6a140a0da..e09fd0d85 100644 --- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp +++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp @@ -63,8 +63,8 @@ struct RectangularMatrixTest: Corrade::TestSuite::Tester { void constructFromData(); void constructFromDiagonal(); void constructCopy(); - void convert(); + void data(); void row(); @@ -109,8 +109,8 @@ RectangularMatrixTest::RectangularMatrixTest() { &RectangularMatrixTest::constructFromData, &RectangularMatrixTest::constructFromDiagonal, &RectangularMatrixTest::constructCopy, - &RectangularMatrixTest::convert, + &RectangularMatrixTest::data, &RectangularMatrixTest::row, diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index d57079f74..02807ff22 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -62,11 +62,11 @@ struct VectorTest: Corrade::TestSuite::Tester { void constructOneComponent(); void constructConversion(); void constructCopy(); + void convert(); void isZero(); void isNormalized(); - void convert(); void data(); void negative(); @@ -118,11 +118,11 @@ VectorTest::VectorTest() { &VectorTest::constructOneComponent, &VectorTest::constructConversion, &VectorTest::constructCopy, + &VectorTest::convert, &VectorTest::isZero, &VectorTest::isNormalized, - &VectorTest::convert, &VectorTest::data, &VectorTest::negative, @@ -220,16 +220,6 @@ void VectorTest::constructCopy() { CORRADE_COMPARE(b, Vector4(1.0f, 3.5f, 4.0f, -2.7f)); } -void VectorTest::isZero() { - CORRADE_VERIFY(!Vector3(0.01f, 0.0f, 0.0f).isZero()); - CORRADE_VERIFY(Vector3(0.0f, 0.0f, 0.0f).isZero()); -} - -void VectorTest::isNormalized() { - CORRADE_VERIFY(!Vector3(1.0f, 2.0f, -1.0f).isNormalized()); - CORRADE_VERIFY(Vector3(0.0f, 1.0f, 0.0f).isNormalized()); -} - void VectorTest::convert() { constexpr Vec3 a{1.5f, 2.0f, -3.5f}; constexpr Vector3 b(1.5f, 2.0f, -3.5f); @@ -247,6 +237,16 @@ void VectorTest::convert() { CORRADE_VERIFY(!(std::is_convertible::value)); } +void VectorTest::isZero() { + CORRADE_VERIFY(!Vector3(0.01f, 0.0f, 0.0f).isZero()); + CORRADE_VERIFY(Vector3(0.0f, 0.0f, 0.0f).isZero()); +} + +void VectorTest::isNormalized() { + CORRADE_VERIFY(!Vector3(1.0f, 2.0f, -1.0f).isNormalized()); + CORRADE_VERIFY(Vector3(0.0f, 1.0f, 0.0f).isNormalized()); +} + void VectorTest::data() { Vector4 vector(4.0f, 5.0f, 6.0f, 7.0f); vector[2] = 1.0f;