1 files changed, 9 insertions, 18 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/extensions/TestNamer.h b/3rdParty/CppUnit/src/include/cppunit/extensions/TestNamer.h
index 5a6471c..0c8fb31 100644
--- a/3rdParty/CppUnit/src/include/cppunit/extensions/TestNamer.h
+++ b/3rdParty/CppUnit/src/include/cppunit/extensions/TestNamer.h
@@ -3,20 +3,16 @@
 
 #include <cppunit/Portability.h>
 #include <string>
+#include <cppunit/tools/StringHelper.h>
 
-#if CPPUNIT_HAVE_RTTI
-#  include <typeinfo>
-#endif
+#include <typeinfo>
 
 
 
 /*! \def CPPUNIT_TESTNAMER_DECL( variableName, FixtureType )
  * \brief Declares a TestNamer.
  *
- * Declares a TestNamer for the specified type, using RTTI if enabled, otherwise
- * using macro string expansion.
- *
- * RTTI is used if CPPUNIT_USE_TYPEINFO_NAME is defined and not null.
+ * Declares a TestNamer for the specified type
  *
  * \code
  * void someMethod() 
@@ -29,19 +25,11 @@
  * \relates TestNamer
  * \see TestNamer
  */
-#if CPPUNIT_USE_TYPEINFO_NAME
 #  define CPPUNIT_TESTNAMER_DECL( variableName, FixtureType )       \
               CPPUNIT_NS::TestNamer variableName( typeid(FixtureType) )
-#else
-#  define CPPUNIT_TESTNAMER_DECL( variableName, FixtureType )       \
-              CPPUNIT_NS::TestNamer variableName( std::string(#FixtureType) )
-#endif
-
-
 
 CPPUNIT_NS_BEGIN
 
-
 /*! \brief Names a test or a fixture suite.
  *
  * TestNamer is usually instantiated using CPPUNIT_TESTNAMER_DECL.
@@ -50,12 +38,10 @@ CPPUNIT_NS_BEGIN
 class CPPUNIT_API TestNamer
 {
 public:
-#if CPPUNIT_HAVE_RTTI
   /*! \brief Constructs a namer using the fixture's type-info.
    * \param typeInfo Type-info of the fixture type. Use to name the fixture suite.
    */
   TestNamer( const std::type_info &typeInfo );
-#endif
 
   /*! \brief Constructs a namer using the specified fixture name.
    * \param fixtureName Name of the fixture suite. Usually extracted using a macro.
@@ -78,11 +64,16 @@ public:
    */
   virtual std::string getTestNameFor( const std::string &testMethodName ) const;
 
+  template<typename E>
+  std::string getTestNameFor( const std::string& testMethodName, const E& val) const
+  {
+      return getTestNameFor(testMethodName) + " with parameter: " + CPPUNIT_NS::StringHelper::toString(val);
+  }
+
 protected:
   std::string m_fixtureName;
 };
 
-
 CPPUNIT_NS_END
 
 #endif // CPPUNIT_EXTENSIONS_TESTNAMER_H