Browse Source

Math: test code reorganization.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
229d0b130c
  1. 4
      src/Magnum/Math/Test/RectangularMatrixTest.cpp
  2. 24
      src/Magnum/Math/Test/VectorTest.cpp

4
src/Magnum/Math/Test/RectangularMatrixTest.cpp

@ -63,8 +63,8 @@ struct RectangularMatrixTest: Corrade::TestSuite::Tester {
void constructFromData(); void constructFromData();
void constructFromDiagonal(); void constructFromDiagonal();
void constructCopy(); void constructCopy();
void convert(); void convert();
void data(); void data();
void row(); void row();
@ -109,8 +109,8 @@ RectangularMatrixTest::RectangularMatrixTest() {
&RectangularMatrixTest::constructFromData, &RectangularMatrixTest::constructFromData,
&RectangularMatrixTest::constructFromDiagonal, &RectangularMatrixTest::constructFromDiagonal,
&RectangularMatrixTest::constructCopy, &RectangularMatrixTest::constructCopy,
&RectangularMatrixTest::convert, &RectangularMatrixTest::convert,
&RectangularMatrixTest::data, &RectangularMatrixTest::data,
&RectangularMatrixTest::row, &RectangularMatrixTest::row,

24
src/Magnum/Math/Test/VectorTest.cpp

@ -62,11 +62,11 @@ struct VectorTest: Corrade::TestSuite::Tester {
void constructOneComponent(); void constructOneComponent();
void constructConversion(); void constructConversion();
void constructCopy(); void constructCopy();
void convert();
void isZero(); void isZero();
void isNormalized(); void isNormalized();
void convert();
void data(); void data();
void negative(); void negative();
@ -118,11 +118,11 @@ VectorTest::VectorTest() {
&VectorTest::constructOneComponent, &VectorTest::constructOneComponent,
&VectorTest::constructConversion, &VectorTest::constructConversion,
&VectorTest::constructCopy, &VectorTest::constructCopy,
&VectorTest::convert,
&VectorTest::isZero, &VectorTest::isZero,
&VectorTest::isNormalized, &VectorTest::isNormalized,
&VectorTest::convert,
&VectorTest::data, &VectorTest::data,
&VectorTest::negative, &VectorTest::negative,
@ -220,16 +220,6 @@ void VectorTest::constructCopy() {
CORRADE_COMPARE(b, Vector4(1.0f, 3.5f, 4.0f, -2.7f)); 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() { void VectorTest::convert() {
constexpr Vec3 a{1.5f, 2.0f, -3.5f}; constexpr Vec3 a{1.5f, 2.0f, -3.5f};
constexpr Vector3 b(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<Vector3, Vec3>::value)); CORRADE_VERIFY(!(std::is_convertible<Vector3, Vec3>::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() { void VectorTest::data() {
Vector4 vector(4.0f, 5.0f, 6.0f, 7.0f); Vector4 vector(4.0f, 5.0f, 6.0f, 7.0f);
vector[2] = 1.0f; vector[2] = 1.0f;

Loading…
Cancel
Save