diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index 6698891991..9944daf9ee 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -77,6 +77,12 @@ #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 diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index 37a7840bba..d3cfd79117 100644 --- a/tests/strings/strings.cpp +++ b/tests/strings/strings.cpp @@ -615,7 +615,7 @@ void StringTestCase::WriteBuf() CPPUNIT_ASSERT_EQUAL(_T('f'), s[0u]); CPPUNIT_ASSERT_EQUAL(_T('o'), s[1]); CPPUNIT_ASSERT_EQUAL(_T('o'), s[2]); - CPPUNIT_ASSERT_EQUAL(3u, s.length()); + WX_ASSERT_SIZET_EQUAL(3, s.length()); { wxChar *p = s.GetWriteBuf(10); @@ -626,7 +626,7 @@ void StringTestCase::WriteBuf() CPPUNIT_ASSERT_EQUAL(_T('a'), s[1]); CPPUNIT_ASSERT_EQUAL(_T('r'), s[2]); CPPUNIT_ASSERT_EQUAL(_T('r'), s[3]); - CPPUNIT_ASSERT_EQUAL(4u, s.length()); + WX_ASSERT_SIZET_EQUAL(4, s.length()); CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) ); }