Swiftdiff options
Diffstat (limited to '3rdParty/CppUnit/src/include/cppunit/TestCaller.h')
| -rw-r--r-- | 3rdParty/CppUnit/src/include/cppunit/TestCaller.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/TestCaller.h b/3rdParty/CppUnit/src/include/cppunit/TestCaller.h index dc4d82e..fbf3902 100644 --- a/3rdParty/CppUnit/src/include/cppunit/TestCaller.h +++ b/3rdParty/CppUnit/src/include/cppunit/TestCaller.h @@ -6,4 +6,6 @@ +#include <functional> -#if CPPUNIT_USE_TYPEINFO_NAME + +#if defined(CPPUNIT_USE_TYPEINFO_NAME) # include <cppunit/extensions/TypeInfoHelper.h> @@ -35,3 +37,3 @@ struct ExpectedExceptionTraits { -#if CPPUNIT_USE_TYPEINFO_NAME +#if defined(CPPUNIT_USE_TYPEINFO_NAME) throw Exception( Message( @@ -118,3 +120,3 @@ public: m_fixture( new Fixture() ), - m_test( test ) + m_test_function( std::bind(test, m_fixture) ) { @@ -135,3 +137,3 @@ public: m_fixture( &fixture ), - m_test( test ) + m_test_function( std::bind(test, &fixture) ) { @@ -152,5 +154,13 @@ public: m_fixture( fixture ), - m_test( test ) + m_test_function( std::bind(test, fixture) ) { } + + TestCaller(std::string name, std::function<void()> test_function, Fixture* fixture): + TestCase(name), + m_ownFixture(true), + m_fixture(fixture), + m_test_function(test_function) + { + } @@ -164,10 +174,3 @@ public: { -// try { - (m_fixture->*m_test)(); -// } -// catch ( ExpectedException & ) { -// return; -// } - -// ExpectedExceptionTraits<ExpectedException>::expectedException(); + m_test_function(); } @@ -196,3 +199,3 @@ private: Fixture *m_fixture; - TestMethod m_test; + std::function<void()> m_test_function; }; |