X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55d9f029b6bb9b273ab1682234063b7563ed96b7..44c87b7d15d5c1f5926beffa4cd5c9d1d2045e04:/include/wx/cppunit.h diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index e96196343c..59f79b831d 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -123,7 +123,7 @@ assertEquals(const wchar_t *expected, // and another to be able to specify (usually literal) ints as expected values // for functions returning size_t -WX_CPPUNIT_ASSERT_EQUALS(int, size_t); +WX_CPPUNIT_ASSERT_EQUALS(int, size_t) // special section with VC6 workarounds: due to incorrect resolution of // overloaded/template functions in this compiler (it basically doesn't use the @@ -131,8 +131,8 @@ WX_CPPUNIT_ASSERT_EQUALS(int, size_t); // none of them matches fully) we also need #ifdef __VISUALC6__ -WX_CPPUNIT_ASSERT_EQUALS(int, int); -WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t); +WX_CPPUNIT_ASSERT_EQUALS(int, int) +WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t) #endif // VC6 @@ -160,6 +160,10 @@ CPPUNIT_NS_END #define WX_ASSERT_MESSAGE(msg, cond) \ CPPUNIT_ASSERT_MESSAGE(std::string(wxString::Format msg .mb_str()), (cond)) +#define WX_ASSERT_EQUAL_MESSAGE(msg, expected, actual) \ + CPPUNIT_ASSERT_EQUAL_MESSAGE(std::string(wxString::Format msg .mb_str()), \ + (expected), (actual)) + /////////////////////////////////////////////////////////////////////////////// // define stream inserter for wxString if it's not defined in the main library, // we need it to output the test failures involving wxString