X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c94045365a17840b71aaf3ce2f08512e9474eeb..da52a4e023e73c2922f63d95026816a624695559:/include/wx/cppunit.h diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index 8bbc99f7f5..7f1923332a 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -28,13 +28,17 @@ #ifdef __BORLANDC__ #pragma warn -8022 #endif - + +#ifndef CPPUNIT_STD_NEED_ALLOCATOR + #define CPPUNIT_STD_NEED_ALLOCATOR 0 +#endif + /////////////////////////////////////////////////////////////////////////////// // Set the default format for the errors, which can be used by an IDE to jump // to the error location. This default gets overridden by the cppunit headers // for some compilers (e.g. VC++). -#ifndef CPPUNIT_COMPILER_LOCATION_FORMAT +#ifndef CPPUNIT_COMPILER_LOCATION_FORMAT #define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l:" #endif @@ -77,16 +81,29 @@ #define WXTEST_FAIL_WITH_CONDITION(suiteName, Condition, testMethod) \ WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod)) +// Use this macro to compare a wxString with a literal string. +#define WX_ASSERT_STR_EQUAL(p, s) CPPUNIT_ASSERT_EQUAL(wxString(p), s) + +// Use this macro to compare a size_t with a literal integer +#define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m) /////////////////////////////////////////////////////////////////////////////// -// stream inserter for wxString -// +// define stream inserter for wxString if it's not defined in the main library, +// we need it to output the test failures involving wxString +#if !wxUSE_STD_IOSTREAM + +#include "wx/string.h" inline std::ostream& operator<<(std::ostream& o, const wxString& s) { - return o << s.mb_str(); +#if wxUSE_UNICODE + return o << (const char *)wxSafeConvertWX2MB(s.wc_str()); +#else + return o << s.c_str(); +#endif } +#endif // !wxUSE_STD_IOSTREAM /////////////////////////////////////////////////////////////////////////////// // Some more compiler warning tweaking and auto linking.