ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Properly test swizzle() constexpr. 

Removed constExpressions() test case and merged it to others, reducing
duplicate code.
pull/278/head
Vladimír Vondruš 13 years ago
parent
a60f35a026
commit
7b140db3ed
2 changed files with 44 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/Math/Test/SwizzleTest.cpp
  2. 48
      src/Test/SwizzleTest.cpp

28
src/Math/Test/SwizzleTest.cpp
Unescape View File

@ -35,7 +35,6 @@ class SwizzleTest: public Corrade::TestSuite::Tester {
void components(); void components();
void constants(); void constants();
void sizes(); void sizes();
void constExpressions();
}; };
typedef Vector<4, Int> Vector4i; typedef Vector<4, Int> Vector4i;
@ -43,33 +42,28 @@ typedef Vector<4, Int> Vector4i;
SwizzleTest::SwizzleTest() { SwizzleTest::SwizzleTest() {
addTests({&SwizzleTest::components, addTests({&SwizzleTest::components,
&SwizzleTest::constants, &SwizzleTest::constants,
&SwizzleTest::sizes, &SwizzleTest::sizes});
&SwizzleTest::constExpressions});
} }
void SwizzleTest::components() { void SwizzleTest::components() {
CORRADE_COMPARE((swizzle<'z', 'x', 'w', 'y'>(Vector4i(2, 4, 5, 7))), Vector4i(5, 2, 7, 4)); constexpr auto a = swizzle<'z', 'x', 'w', 'y'>(Vector4i(2, 4, 5, 7));
CORRADE_COMPARE(a, Vector4i(5, 2, 7, 4));
} }
void SwizzleTest::constants() { void SwizzleTest::constants() {
CORRADE_COMPARE((swizzle<'1', 'w', '0', 'y'>(Vector4i(2, 4, 5, 7))), Vector4i(1, 7, 0, 4)); constexpr auto a = swizzle<'1', 'w', '0', 'y'>(Vector4i(2, 4, 5, 7));
CORRADE_COMPARE(a, Vector4i(1, 7, 0, 4));
} }
void SwizzleTest::sizes() { void SwizzleTest::sizes() {
CORRADE_COMPARE((swizzle<'y', 'x', 'x'>(Math::Vector<2, Int>(1, 2))), constexpr auto a = swizzle<'y', 'x', 'x'>(Math::Vector<2, Int>(1, 2));
(Math::Vector<3, Int>(2, 1, 1))); CORRADE_COMPARE(a, (Math::Vector<3, Int>(2, 1, 1)));
CORRADE_COMPARE(swizzle<'z'>(Vector4i(1, 2, 3, 4)),
(Math::Vector<1, Int>(3)));
CORRADE_COMPARE((swizzle<'z', 'x', 'w', 'y', 'z', 'y', 'x'>(Vector4i(1, 2, 3, 4))),
(Math::Vector<7, Int>(3, 1, 4, 2, 3, 2, 1)));
}
void SwizzleTest::constExpressions() { constexpr auto b = swizzle<'z'>(Vector4i(1, 2, 3, 4));
constexpr auto a = swizzle<'z', 'x', 'w', 'y'>(Vector4i(2, 4, 5, 7)); CORRADE_COMPARE(b, (Math::Vector<1, Int>(3)));
CORRADE_COMPARE(a, Vector4i(5, 2, 7, 4));
constexpr auto b = swizzle<'1', 'w', '0', 'y'>(Vector4i(2, 4, 5, 7)); constexpr auto c = swizzle<'z', 'x', 'w', 'y', 'z', 'y', 'x'>(Vector4i(1, 2, 3, 4));
CORRADE_COMPARE(b, Vector4i(1, 7, 0, 4)); CORRADE_COMPARE(c, (Math::Vector<7, Int>(3, 1, 4, 2, 3, 2, 1)));
} }
}}} }}}

48
src/Test/SwizzleTest.cpp
Unescape View File

@ -44,27 +44,45 @@ SwizzleTest::SwizzleTest() {
} }
void SwizzleTest::rgba() { void SwizzleTest::rgba() {
CORRADE_COMPARE((swizzle<'b', 'r', 'a', 'g'>(Vector4i(2, 4, 5, 7))), Vector4i(5, 2, 7, 4)); constexpr auto a = swizzle<'b', 'r', 'a', 'g'>(Vector4i(2, 4, 5, 7));
CORRADE_COMPARE(a, Vector4i(5, 2, 7, 4));
} }
void SwizzleTest::type() { void SwizzleTest::type() {
Vector4i orig; constexpr Vector4i orig;
CORRADE_VERIFY((std::is_same<decltype(swizzle<'y', 'a'>(orig)), Vector2i>::value)); constexpr Color3<Float> origColor3;
CORRADE_VERIFY((std::is_same<decltype(swizzle<'y', 'z', 'a'>(orig)), Vector3i>::value)); constexpr Color4<Double> origColor4;
CORRADE_VERIFY((std::is_same<decltype(swizzle<'y', 'a', 'y', 'x'>(orig)), Vector4i>::value));
constexpr auto a = swizzle<'y', 'a'>(orig);
Color3<Float> origColor3; CORRADE_VERIFY((std::is_same<decltype(a), const Vector2i>::value));
Color4<Double> origColor4;
CORRADE_VERIFY((std::is_same<decltype(swizzle<'y', 'z', 'r'>(origColor3)), Color3<Float>>::value)); constexpr auto b = swizzle<'y', 'z', 'a'>(orig);
CORRADE_VERIFY((std::is_same<decltype(swizzle<'y', 'z', 'a'>(origColor4)), Color3<Double>>::value)); CORRADE_VERIFY((std::is_same<decltype(b), const Vector3i>::value));
CORRADE_VERIFY((std::is_same<decltype(swizzle<'y', 'z', 'y', 'x'>(origColor3)), Color4<Float>>::value));
CORRADE_VERIFY((std::is_same<decltype(swizzle<'y', 'a', 'y', 'x'>(origColor4)), Color4<Double>>::value)); constexpr auto c = swizzle<'y', 'a', 'y', 'x'>(orig);
CORRADE_VERIFY((std::is_same<decltype(c), const Vector4i>::value));
constexpr auto d = swizzle<'y', 'z', 'r'>(origColor3);
CORRADE_VERIFY((std::is_same<decltype(d), const Color3<Float>>::value));
constexpr auto e = swizzle<'y', 'z', 'a'>(origColor4);
CORRADE_VERIFY((std::is_same<decltype(e), const Color3<Double>>::value));
constexpr auto f = swizzle<'y', 'z', 'y', 'x'>(origColor3);
CORRADE_VERIFY((std::is_same<decltype(f), const Color4<Float>>::value));
constexpr auto g = swizzle<'y', 'a', 'y', 'x'>(origColor4);
CORRADE_VERIFY((std::is_same<decltype(g), const Color4<Double>>::value));
} }
void SwizzleTest::defaultType() { void SwizzleTest::defaultType() {
Vector4i orig(1, 2, 3, 4); constexpr Vector4i orig(1, 2, 3, 4);
CORRADE_COMPARE(swizzle<'b'>(orig), (Math::Vector<1, Int>(3)));
CORRADE_COMPARE((swizzle<'b', 'r', 'a', 'g', 'z', 'y', 'x'>(orig)), (Math::Vector<7, Int>(3, 1, 4, 2, 3, 2, 1))); constexpr auto a = swizzle<'b'>(orig);
CORRADE_COMPARE(a, (Math::Vector<1, Int>(3)));
constexpr auto b = swizzle<'b', 'r', 'a', 'g', 'z', 'y', 'x'>(orig);
CORRADE_COMPARE(b, (Math::Vector<7, Int>(3, 1, 4, 2, 3, 2, 1)));
} }
}} }}

Write Preview
Loading…
Cancel
Save