Swiftdiff options
| author | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-14 21:08:53 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-15 11:58:11 (GMT) |
| commit | 8230b23238b4d0ef0fcde01a799758558d502fa1 (patch) | |
| tree | 849251b42e457357b86a2ba91e9b78f635cc55a3 /3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h | |
| parent | caca46ceedddd43c707e7eda9b4c765d61730ccb (diff) | |
| download | swift-8230b23238b4d0ef0fcde01a799758558d502fa1.zip swift-8230b23238b4d0ef0fcde01a799758558d502fa1.tar.bz2 | |
Update 3rdParty/CppUnit to version 1.14.0
This gets rid of std::auto_ptr usage and its deprecation
warnings.
Test-Information:
Builds and tests pass on macOS.
Change-Id: I299a0a8d9aa2ead15c933e83a2e3e53f84a4f5b7
Diffstat (limited to '3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h b/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h index db26926..72bfa70 100644 --- a/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h +++ b/3rdParty/CppUnit/src/include/cppunit/extensions/TestSuiteBuilderContext.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H | 2 | #define CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H |
| 3 | 3 | ||
| 4 | #include <cppunit/Portability.h> | 4 | #include <cppunit/Portability.h> |
| 5 | #include <cppunit/portability/CppUnitMap.h> | 5 | #include <map> |
| 6 | #include <string> | 6 | #include <string> |
| 7 | 7 | ||
| 8 | #if CPPUNIT_NEED_DLL_DECL | 8 | #if CPPUNIT_NEED_DLL_DECL |
| @@ -62,6 +62,21 @@ public: | |||
| 62 | */ | 62 | */ |
| 63 | std::string getTestNameFor( const std::string &testMethodName ) const; | 63 | std::string getTestNameFor( const std::string &testMethodName ) const; |
| 64 | 64 | ||
| 65 | /*! \brief Returns the name of the test for the specified method with the corresponding parameter. | ||
| 66 | * | ||
| 67 | * \param testMethodName Name (including a parameter) of the method that implements a test. | ||
| 68 | * \return A string that is the concatenation of the test fixture name | ||
| 69 | * (returned by getFixtureName()), \a testMethodName, | ||
| 70 | * separated using '::' and the parameter. This provides a fairly unique name for a given | ||
| 71 | * test. The parameter must be convertable to std::string through operator<< | ||
| 72 | * or a specialization of CPPUNIT_NS::StringHelper::toString needs to exist. | ||
| 73 | */ | ||
| 74 | template<typename T> | ||
| 75 | std::string getTestNameFor( const std::string &testMethodName, const T& value ) const | ||
| 76 | { | ||
| 77 | return m_namer.getTestNameFor(testMethodName, value); | ||
| 78 | } | ||
| 79 | |||
| 65 | /*! \brief Adds property pair. | 80 | /*! \brief Adds property pair. |
| 66 | * \param key PropertyKey string to add. | 81 | * \param key PropertyKey string to add. |
| 67 | * \param value PropertyValue string to add. | 82 | * \param value PropertyValue string to add. |
| @@ -81,7 +96,7 @@ protected: | |||
| 81 | // shared std::map in dll bug in VC6. | 96 | // shared std::map in dll bug in VC6. |
| 82 | // See http://www.dinkumware.com/vc_fixes.html for detail. | 97 | // See http://www.dinkumware.com/vc_fixes.html for detail. |
| 83 | typedef std::pair<std::string,std::string> Property; | 98 | typedef std::pair<std::string,std::string> Property; |
| 84 | typedef CppUnitVector<Property> Properties; | 99 | typedef std::vector<Property> Properties; |
| 85 | 100 | ||
| 86 | TestSuite &m_suite; | 101 | TestSuite &m_suite; |
| 87 | const TestNamer &m_namer; | 102 | const TestNamer &m_namer; |