Browse Source

Math: make test using declarations consistent as well.

pull/680/head
Vladimír Vondruš 9 months ago
parent
commit
c41a13ecc8
  1. 16
      src/Magnum/Math/Test/BezierTest.cpp
  2. 2
      src/Magnum/Math/Test/BitVectorTest.cpp
  3. 20
      src/Magnum/Math/Test/ComplexTest.cpp
  4. 26
      src/Magnum/Math/Test/CubicHermiteTest.cpp
  5. 2
      src/Magnum/Math/Test/DualComplexTest.cpp
  6. 4
      src/Magnum/Math/Test/DualTest.cpp
  7. 6
      src/Magnum/Math/Test/FrustumTest.cpp
  8. 14
      src/Magnum/Math/Test/InterpolationBenchmark.cpp
  9. 6
      src/Magnum/Math/Test/QuaternionTest.cpp
  10. 2
      src/Magnum/Math/Test/RangeTest.cpp
  11. 6
      src/Magnum/Math/Test/TimeStlTest.cpp
  12. 6
      src/Magnum/Math/Test/TimeTest.cpp
  13. 2
      src/Magnum/Math/Test/Vector2Test.cpp
  14. 2
      src/Magnum/Math/Test/Vector3Test.cpp
  15. 2
      src/Magnum/Math/Test/Vector4Test.cpp
  16. 4
      src/Magnum/Math/Test/VectorTest.cpp

16
src/Magnum/Math/Test/BezierTest.cpp

@ -58,14 +58,6 @@ template<> struct BezierConverter<2, 2, Float, QBezier2D> {
namespace Test { namespace { namespace Test { namespace {
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Vector2;
typedef Math::Bezier<1, 2, Float> LinearBezier2D;
using Magnum::QuadraticBezier2D;
using Magnum::CubicBezier2D;
using Magnum::CubicHermite2D;
struct BezierTest: TestSuite::Tester { struct BezierTest: TestSuite::Tester {
explicit BezierTest(); explicit BezierTest();
@ -93,6 +85,14 @@ struct BezierTest: TestSuite::Tester {
void debug(); void debug();
}; };
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Vector2;
typedef Math::Bezier<1, 2, Float> LinearBezier2D;
using Magnum::QuadraticBezier2D;
using Magnum::CubicBezier2D;
using Magnum::CubicHermite2D;
BezierTest::BezierTest() { BezierTest::BezierTest() {
addTests({&BezierTest::construct, addTests({&BezierTest::construct,
&BezierTest::constructDefault, &BezierTest::constructDefault,

2
src/Magnum/Math/Test/BitVectorTest.cpp

@ -87,6 +87,8 @@ static_assert(BitVector<15>::DataSize == 2, "Improper DataSize");
static_assert(BitVector<16>::DataSize == 2, "Improper DataSize"); static_assert(BitVector<16>::DataSize == 2, "Improper DataSize");
static_assert(BitVector<17>::DataSize == 3, "Improper DataSize"); static_assert(BitVector<17>::DataSize == 3, "Improper DataSize");
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
typedef Math::BitVector<19> BitVector19; typedef Math::BitVector<19> BitVector19;
BitVectorTest::BitVectorTest() { BitVectorTest::BitVectorTest() {

20
src/Magnum/Math/Test/ComplexTest.cpp

@ -107,6 +107,17 @@ struct ComplexTest: TestSuite::Tester {
void debug(); void debug();
}; };
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Deg;
using Magnum::Rad;
using Magnum::Complex;
using Magnum::Vector2;
using Magnum::Matrix3;
using Magnum::Matrix2x2;
ComplexTest::ComplexTest() { ComplexTest::ComplexTest() {
addTests({&ComplexTest::construct, addTests({&ComplexTest::construct,
&ComplexTest::constructIdentity, &ComplexTest::constructIdentity,
@ -161,15 +172,6 @@ ComplexTest::ComplexTest() {
&ComplexTest::debug}); &ComplexTest::debug});
} }
using Magnum::Deg;
using Magnum::Rad;
using Magnum::Complex;
using Magnum::Vector2;
using Magnum::Matrix3;
using Magnum::Matrix2x2;
using namespace Math::Literals;
void ComplexTest::construct() { void ComplexTest::construct() {
constexpr Complex a = {0.5f, -3.7f}; constexpr Complex a = {0.5f, -3.7f};
CORRADE_COMPARE(a, Complex(0.5f, -3.7f)); CORRADE_COMPARE(a, Complex(0.5f, -3.7f));

26
src/Magnum/Math/Test/CubicHermiteTest.cpp

@ -124,6 +124,20 @@ struct CubicHermiteTest: TestSuite::Tester {
void debugQuaternion(); void debugQuaternion();
}; };
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Vector2;
using Magnum::Vector3;
using Magnum::Complex;
using Magnum::Quaternion;
using Magnum::CubicBezier2D;
using Magnum::CubicHermite1D;
using Magnum::CubicHermite2D;
using Magnum::CubicHermiteComplex;
using Magnum::CubicHermiteQuaternion;
CubicHermiteTest::CubicHermiteTest() { CubicHermiteTest::CubicHermiteTest() {
addTests({&CubicHermiteTest::constructScalar, addTests({&CubicHermiteTest::constructScalar,
&CubicHermiteTest::constructVector, &CubicHermiteTest::constructVector,
@ -209,18 +223,6 @@ CubicHermiteTest::CubicHermiteTest() {
&CubicHermiteTest::debugQuaternion}); &CubicHermiteTest::debugQuaternion});
} }
using namespace Math::Literals;
using Magnum::Vector2;
using Magnum::Vector3;
using Magnum::Complex;
using Magnum::Quaternion;
using Magnum::CubicBezier2D;
using Magnum::CubicHermite1D;
using Magnum::CubicHermite2D;
using Magnum::CubicHermiteComplex;
using Magnum::CubicHermiteQuaternion;
void CubicHermiteTest::constructScalar() { void CubicHermiteTest::constructScalar() {
constexpr CubicHermite1D a{2.0f, -2.0f, -0.5f}; constexpr CubicHermite1D a{2.0f, -2.0f, -0.5f};
CubicHermite1D b{2.0f, -2.0f, -0.5f}; CubicHermite1D b{2.0f, -2.0f, -0.5f};

2
src/Magnum/Math/Test/DualComplexTest.cpp

@ -103,7 +103,7 @@ struct DualComplexTest: TestSuite::Tester {
void debug(); void debug();
}; };
using namespace Math::Literals; using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum /* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */ namespace, or is not present there at all */

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

@ -70,6 +70,8 @@ struct DualTest: TestSuite::Tester {
void debug(); void debug();
}; };
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum /* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */ namespace, or is not present there at all */
typedef Math::Dual<Float> Dual; typedef Math::Dual<Float> Dual;
@ -79,8 +81,6 @@ using Magnum::Deg;
using Magnum::Rad; using Magnum::Rad;
using Magnum::Constants; using Magnum::Constants;
using namespace Literals;
DualTest::DualTest() { DualTest::DualTest() {
addTests({&DualTest::construct, addTests({&DualTest::construct,
&DualTest::constructDefault, &DualTest::constructDefault,

6
src/Magnum/Math/Test/FrustumTest.cpp

@ -88,6 +88,10 @@ struct FrustumTest: TestSuite::Tester {
void debug(); void debug();
}; };
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Vector4; using Magnum::Vector4;
using Magnum::Matrix4; using Magnum::Matrix4;
using Magnum::Frustum; using Magnum::Frustum;
@ -258,8 +262,6 @@ void FrustumTest::constructCopy() {
} }
void FrustumTest::constructFromMatrix() { void FrustumTest::constructFromMatrix() {
using namespace Magnum::Math::Literals;
Frustum expected{ Frustum expected{
{ 1.0f, 0.0f, -1.0f, 0.0f}, { 1.0f, 0.0f, -1.0f, 0.0f},
{-1.0f, 0.0f, -1.0f, 0.0f}, {-1.0f, 0.0f, -1.0f, 0.0f},

14
src/Magnum/Math/Test/InterpolationBenchmark.cpp

@ -46,12 +46,6 @@ struct InterpolationBenchmark: TestSuite::Tester {
void dualQuaternionSclerpShortestPath(); void dualQuaternionSclerpShortestPath();
}; };
using namespace Math::Literals;
using Magnum::Quaternion;
using Magnum::DualQuaternion;
using Magnum::Vector3;
InterpolationBenchmark::InterpolationBenchmark() { InterpolationBenchmark::InterpolationBenchmark() {
addBenchmarks({&InterpolationBenchmark::baseline, addBenchmarks({&InterpolationBenchmark::baseline,
&InterpolationBenchmark::quaternionLerp, &InterpolationBenchmark::quaternionLerp,
@ -62,6 +56,14 @@ InterpolationBenchmark::InterpolationBenchmark() {
&InterpolationBenchmark::dualQuaternionSclerpShortestPath}, 100); &InterpolationBenchmark::dualQuaternionSclerpShortestPath}, 100);
} }
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace */
using Magnum::Quaternion;
using Magnum::DualQuaternion;
using Magnum::Vector3;
void InterpolationBenchmark::baseline() { void InterpolationBenchmark::baseline() {
Quaternion c; Quaternion c;
Float t = 0.0f; Float t = 0.0f;

6
src/Magnum/Math/Test/QuaternionTest.cpp

@ -133,6 +133,10 @@ struct QuaternionTest: TestSuite::Tester {
void debug(); void debug();
}; };
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Deg; using Magnum::Deg;
using Magnum::Rad; using Magnum::Rad;
using Magnum::Matrix3x3; using Magnum::Matrix3x3;
@ -142,8 +146,6 @@ using Magnum::Vector2;
using Magnum::Vector3; using Magnum::Vector3;
using Magnum::Vector4; using Magnum::Vector4;
using namespace Math::Literals;
QuaternionTest::QuaternionTest() { QuaternionTest::QuaternionTest() {
addTests({&QuaternionTest::construct, addTests({&QuaternionTest::construct,
&QuaternionTest::constructIdentity, &QuaternionTest::constructIdentity,

2
src/Magnum/Math/Test/RangeTest.cpp

@ -150,6 +150,8 @@ struct RangeTest: TestSuite::Tester {
void debugPacked(); void debugPacked();
}; };
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Range1D; using Magnum::Range1D;
using Magnum::Range2D; using Magnum::Range2D;
using Magnum::Range3D; using Magnum::Range3D;

6
src/Magnum/Math/Test/TimeStlTest.cpp

@ -44,9 +44,11 @@ TimeStlTest::TimeStlTest() {
&TimeStlTest::chronoTimePoint}); &TimeStlTest::chronoTimePoint});
} }
using Magnum::Nanoseconds; using namespace Literals;
using namespace Math::Literals; /* What's a typedef and not a using differs from the typedefs in root Magnum
namespace */
using Magnum::Nanoseconds;
void TimeStlTest::chronoDurationTypedefs() { void TimeStlTest::chronoDurationTypedefs() {
/* Negative values should work as well */ /* Negative values should work as well */

6
src/Magnum/Math/Test/TimeTest.cpp

@ -85,11 +85,13 @@ struct TimeTest: TestSuite::Tester {
void debugSecondsPacked(); void debugSecondsPacked();
}; };
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace */
using Magnum::Nanoseconds; using Magnum::Nanoseconds;
using Magnum::Seconds; using Magnum::Seconds;
using namespace Math::Literals;
TimeTest::TimeTest() { TimeTest::TimeTest() {
addTests({&TimeTest::limits, addTests({&TimeTest::limits,

2
src/Magnum/Math/Test/Vector2Test.cpp

@ -83,6 +83,8 @@ struct Vector2Test: TestSuite::Tester {
void debug(); void debug();
}; };
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Vector2; using Magnum::Vector2;
Vector2Test::Vector2Test() { Vector2Test::Vector2Test() {

2
src/Magnum/Math/Test/Vector3Test.cpp

@ -83,6 +83,8 @@ struct Vector3Test: TestSuite::Tester {
void debug(); void debug();
}; };
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Vector3; using Magnum::Vector3;
using Magnum::Vector2; using Magnum::Vector2;

2
src/Magnum/Math/Test/Vector4Test.cpp

@ -85,6 +85,8 @@ struct Vector4Test: TestSuite::Tester {
void debug(); void debug();
}; };
/* What's a typedef and not a using differs from the typedefs in root Magnum
namespace, or is not present there at all */
using Magnum::Vector4; using Magnum::Vector4;
using Magnum::Vector3; using Magnum::Vector3;
using Magnum::Vector2; using Magnum::Vector2;

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

@ -129,6 +129,8 @@ struct VectorTest: TestSuite::Tester {
void debugPropagateFlags(); void debugPropagateFlags();
}; };
using namespace Literals;
/* What's a typedef and not a using differs from the typedefs in root Magnum /* What's a typedef and not a using differs from the typedefs in root Magnum
namespace */ namespace */
using Magnum::Constants; using Magnum::Constants;
@ -145,8 +147,6 @@ typedef Vector<3, Half> Vector3h;
typedef Vector<3, Int> Vector3i; typedef Vector<3, Int> Vector3i;
typedef Vector<2, Int> Vector2i; typedef Vector<2, Int> Vector2i;
using namespace Literals;
VectorTest::VectorTest() { VectorTest::VectorTest() {
addTests({&VectorTest::construct, addTests({&VectorTest::construct,
&VectorTest::constructFromData, &VectorTest::constructFromData,

Loading…
Cancel
Save