From 9ade2cae479ad904e26c52d5689bc5522798c5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 1 Sep 2016 12:01:50 +0200
Subject: [PATCH] Math: added TypeTraits::name(), using that in the test.

---
 src/Magnum/Math/Test/TypeTraitsTest.cpp | 63 +++++++++++++++++--------
 src/Magnum/Math/TypeTraits.h            | 31 +++++++++++-
 2 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp
index 82d22fcbd..b3767e999 100644
--- a/src/Magnum/Math/Test/TypeTraitsTest.cpp
+++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp
@@ -33,6 +33,8 @@ namespace Magnum { namespace Math { namespace Test {
 struct TypeTraitsTest: Corrade::TestSuite::Tester {
     explicit TypeTraitsTest();
 
+    void name();
+
     template<class T> void equalsIntegral();
     template<class T> void equalsFloatingPoint0();
     template<class T> void equalsFloatingPoint1();
@@ -42,53 +44,74 @@ struct TypeTraitsTest: Corrade::TestSuite::Tester {
 };
 
 TypeTraitsTest::TypeTraitsTest() {
-    addTests<TypeTraitsTest>({&TypeTraitsTest::equalsIntegral<UnsignedByte>,
-              &TypeTraitsTest::equalsIntegral<Byte>,
-              &TypeTraitsTest::equalsIntegral<UnsignedShort>,
-              &TypeTraitsTest::equalsIntegral<Short>,
-              &TypeTraitsTest::equalsIntegral<UnsignedInt>,
-              &TypeTraitsTest::equalsIntegral<Int>,
-              #ifndef CORRADE_TARGET_EMSCRIPTEN
-              &TypeTraitsTest::equalsIntegral<UnsignedLong>,
-              &TypeTraitsTest::equalsIntegral<Long>,
-              #endif
-              &TypeTraitsTest::equalsFloatingPoint0<Float>,
-              &TypeTraitsTest::equalsFloatingPoint0<Double>,
-              &TypeTraitsTest::equalsFloatingPoint1<Float>,
-              &TypeTraitsTest::equalsFloatingPoint1<Double>,
-              &TypeTraitsTest::equalsFloatingPointLarge<Float>,
-              &TypeTraitsTest::equalsFloatingPointLarge<Double>,
-              &TypeTraitsTest::equalsFloatingPointInfinity<Float>,
-              &TypeTraitsTest::equalsFloatingPointInfinity<Double>,
-              &TypeTraitsTest::equalsFloatingPointNaN<Float>,
-              &TypeTraitsTest::equalsFloatingPointNaN<Double>});
+    addTests<TypeTraitsTest>({
+        &TypeTraitsTest::name,
+
+        &TypeTraitsTest::equalsIntegral<UnsignedByte>,
+        &TypeTraitsTest::equalsIntegral<Byte>,
+        &TypeTraitsTest::equalsIntegral<UnsignedShort>,
+        &TypeTraitsTest::equalsIntegral<Short>,
+        &TypeTraitsTest::equalsIntegral<UnsignedInt>,
+        &TypeTraitsTest::equalsIntegral<Int>,
+        #ifndef CORRADE_TARGET_EMSCRIPTEN
+        &TypeTraitsTest::equalsIntegral<UnsignedLong>,
+        &TypeTraitsTest::equalsIntegral<Long>,
+        #endif
+
+        &TypeTraitsTest::equalsFloatingPoint0<Float>,
+        &TypeTraitsTest::equalsFloatingPoint0<Double>,
+        &TypeTraitsTest::equalsFloatingPoint1<Float>,
+        &TypeTraitsTest::equalsFloatingPoint1<Double>,
+        &TypeTraitsTest::equalsFloatingPointLarge<Float>,
+        &TypeTraitsTest::equalsFloatingPointLarge<Double>,
+        &TypeTraitsTest::equalsFloatingPointInfinity<Float>,
+        &TypeTraitsTest::equalsFloatingPointInfinity<Double>,
+        &TypeTraitsTest::equalsFloatingPointNaN<Float>,
+        &TypeTraitsTest::equalsFloatingPointNaN<Double>});
+}
+
+void TypeTraitsTest::name() {
+    CORRADE_COMPARE(TypeTraits<UnsignedShort>::name(), "UnsignedShort");
+    CORRADE_COMPARE(TypeTraits<Float>::name(), "Float");
 }
 
 template<class T> void TypeTraitsTest::equalsIntegral() {
+    setTestCaseName(std::string{"equalsIntegral<"} + TypeTraits<T>::name() + ">");
+
     CORRADE_VERIFY(!TypeTraits<T>::equals(1, 1+TypeTraits<T>::epsilon()));
 }
 
 template<class T> void TypeTraitsTest::equalsFloatingPoint0() {
+    setTestCaseName(std::string{"equalsFloatingPoint0<"} + TypeTraits<T>::name() + ">");
+
     CORRADE_VERIFY(TypeTraits<T>::equals(T(0)+TypeTraits<T>::epsilon()/T(2), T(0)));
     CORRADE_VERIFY(!TypeTraits<T>::equals(T(0)+TypeTraits<T>::epsilon()*T(2), T(0)));
 }
 
 template<class T> void TypeTraitsTest::equalsFloatingPoint1() {
+    setTestCaseName(std::string{"equalsFloatingPoint1<"} + TypeTraits<T>::name() + ">");
+
     CORRADE_VERIFY(TypeTraits<T>::equals(T(1)+TypeTraits<T>::epsilon()/T(2), T(1)));
     CORRADE_VERIFY(!TypeTraits<T>::equals(T(1)+TypeTraits<T>::epsilon()*T(3), T(1)));
 }
 
 template<class T> void TypeTraitsTest::equalsFloatingPointLarge() {
+    setTestCaseName(std::string{"equalsFloatingPointLarge<"} + TypeTraits<T>::name() + ">");
+
     CORRADE_VERIFY(TypeTraits<T>::equals(T(25)+TypeTraits<T>::epsilon()*T(2), T(25)));
     CORRADE_VERIFY(!TypeTraits<T>::equals(T(25)+TypeTraits<T>::epsilon()*T(75), T(25)));
 }
 
 template<class T> void TypeTraitsTest::equalsFloatingPointInfinity() {
+    setTestCaseName(std::string{"equalsFloatingPointInfinity<"} + TypeTraits<T>::name() + ">");
+
     CORRADE_VERIFY(TypeTraits<T>::equals(Constants<T>::inf(),
                                          Constants<T>::inf()));
 }
 
 template<class T> void TypeTraitsTest::equalsFloatingPointNaN() {
+    setTestCaseName(std::string{"equalsFloatingPointNaN<"} + TypeTraits<T>::name() + ">");
+
     CORRADE_VERIFY(!TypeTraits<T>::equals(Constants<T>::nan(),
                                           Constants<T>::nan()));
 }
diff --git a/src/Magnum/Math/TypeTraits.h b/src/Magnum/Math/TypeTraits.h
index b15869ea6..1632b7c89 100644
--- a/src/Magnum/Math/TypeTraits.h
+++ b/src/Magnum/Math/TypeTraits.h
@@ -87,6 +87,14 @@ template<class T> struct TypeTraits: Implementation::TypeTraitsDefault<T> {
      */
     typedef U FloatingPointType;
 
+    /**
+     * @brief Type name
+     *
+     * Returns a string representation of type name, such as `"UnsignedInt"`
+     * for @ref UnsignedInt.
+     */
+    constexpr static const char* name();
+
     /**
      * @brief Epsilon value for fuzzy compare
      *
@@ -108,7 +116,26 @@ template<class T> struct TypeTraits: Implementation::TypeTraitsDefault<T> {
 
 /* Integral scalar types */
 namespace Implementation {
-    template<class T> struct TypeTraitsIntegral: TypeTraitsDefault<T> {
+    template<class> struct TypeTraitsName;
+    #define _c(type) template<> struct TypeTraitsName<type> { \
+        constexpr static const char* name() { return #type; } \
+    };
+    _c(UnsignedByte)
+    _c(Byte)
+    _c(UnsignedShort)
+    _c(Short)
+    _c(UnsignedInt)
+    _c(Int)
+    #ifndef MAGNUM_TARGET_WEBGL
+    _c(UnsignedLong)
+    _c(Long)
+    #endif
+    _c(Float)
+    _c(Double)
+    _c(long double)
+    #undef _c
+
+    template<class T> struct TypeTraitsIntegral: TypeTraitsDefault<T>, TypeTraitsName<T> {
         constexpr static T epsilon() { return T(1); }
     };
 }
@@ -144,7 +171,7 @@ template<> struct TypeTraits<Long>: Implementation::TypeTraitsIntegral<Long> {
 /* Floating-point scalar types */
 namespace Implementation {
 
-template<class T> struct TypeTraitsFloatingPoint {
+template<class T> struct TypeTraitsFloatingPoint: TypeTraitsName<T> {
     TypeTraitsFloatingPoint() = delete;
 
     static bool equals(T a, T b);