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 | |||
| @@ -4,8 +4,10 @@ | |||
| 4 | #include <cppunit/Exception.h> | 4 | #include <cppunit/Exception.h> |
| 5 | #include <cppunit/TestCase.h> | 5 | #include <cppunit/TestCase.h> |
| 6 | 6 | ||
| 7 | #include <functional> | ||
| 7 | 8 | ||
| 8 | #if CPPUNIT_USE_TYPEINFO_NAME | 9 | |
| 10 | #if defined(CPPUNIT_USE_TYPEINFO_NAME) | ||
| 9 | # include <cppunit/extensions/TypeInfoHelper.h> | 11 | # include <cppunit/extensions/TypeInfoHelper.h> |
| 10 | #endif | 12 | #endif |
| 11 | 13 | ||
| @@ -33,7 +35,7 @@ struct ExpectedExceptionTraits | |||
| 33 | { | 35 | { |
| 34 | static void expectedException() | 36 | static void expectedException() |
| 35 | { | 37 | { |
| 36 | #if CPPUNIT_USE_TYPEINFO_NAME | 38 | #if defined(CPPUNIT_USE_TYPEINFO_NAME) |
| 37 | throw Exception( Message( | 39 | throw Exception( Message( |
| 38 | "expected exception not thrown", | 40 | "expected exception not thrown", |
| 39 | "Expected exception type: " + | 41 | "Expected exception type: " + |
| @@ -116,7 +118,7 @@ public: | |||
| 116 | TestCase( name ), | 118 | TestCase( name ), |
| 117 | m_ownFixture( true ), | 119 | m_ownFixture( true ), |
| 118 | m_fixture( new Fixture() ), | 120 | m_fixture( new Fixture() ), |
| 119 | m_test( test ) | 121 | m_test_function( std::bind(test, m_fixture) ) |
| 120 | { | 122 | { |
| 121 | } | 123 | } |
| 122 | 124 | ||
| @@ -133,7 +135,7 @@ public: | |||
| 133 | TestCase( name ), | 135 | TestCase( name ), |
| 134 | m_ownFixture( false ), | 136 | m_ownFixture( false ), |
| 135 | m_fixture( &fixture ), | 137 | m_fixture( &fixture ), |
| 136 | m_test( test ) | 138 | m_test_function( std::bind(test, &fixture) ) |
| 137 | { | 139 | { |
| 138 | } | 140 | } |
| 139 | 141 | ||
| @@ -150,9 +152,17 @@ public: | |||
| 150 | TestCase( name ), | 152 | TestCase( name ), |
| 151 | m_ownFixture( true ), | 153 | m_ownFixture( true ), |
| 152 | m_fixture( fixture ), | 154 | m_fixture( fixture ), |
| 153 | m_test( test ) | 155 | m_test_function( std::bind(test, fixture) ) |
| 154 | { | 156 | { |
| 155 | } | 157 | } |
| 158 | |||
| 159 | TestCaller(std::string name, std::function<void()> test_function, Fixture* fixture): | ||
| 160 | TestCase(name), | ||
| 161 | m_ownFixture(true), | ||
| 162 | m_fixture(fixture), | ||
| 163 | m_test_function(test_function) | ||
| 164 | { | ||
| 165 | } | ||
| 156 | 166 | ||
| 157 | ~TestCaller() | 167 | ~TestCaller() |
| 158 | { | 168 | { |
| @@ -162,14 +172,7 @@ public: | |||
| 162 | 172 | ||
| 163 | void runTest() | 173 | void runTest() |
| 164 | { | 174 | { |
| 165 | // try { | 175 | m_test_function(); |
| 166 | (m_fixture->*m_test)(); | ||
| 167 | // } | ||
| 168 | // catch ( ExpectedException & ) { | ||
| 169 | // return; | ||
| 170 | // } | ||
| 171 | |||
| 172 | // ExpectedExceptionTraits<ExpectedException>::expectedException(); | ||
| 173 | } | 176 | } |
| 174 | 177 | ||
| 175 | void setUp() | 178 | void setUp() |
| @@ -194,7 +197,7 @@ private: | |||
| 194 | private: | 197 | private: |
| 195 | bool m_ownFixture; | 198 | bool m_ownFixture; |
| 196 | Fixture *m_fixture; | 199 | Fixture *m_fixture; |
| 197 | TestMethod m_test; | 200 | std::function<void()> m_test_function; |
| 198 | }; | 201 | }; |
| 199 | 202 | ||
| 200 | 203 | ||