Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert r60023 and really fixed compilation problems caused by r60017 by providing assertEquals(const char *, const char *) overload as well

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-04 23:55:05 +00:00
parent 0eb83a1a72
commit 390b8241d3
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/cppunit.h
View File

@@ -87,6 +87,15 @@ CPPUNIT_NS_BEGIN
// provide an overload of cppunit assertEquals(T, T) which can be used to // provide an overload of cppunit assertEquals(T, T) which can be used to
// compare wxStrings directly with C strings // compare wxStrings directly with C strings
inline void
assertEquals(const char *expected,
const char *actual,
CppUnit::SourceLine sourceLine,
const std::string& message)
{
assertEquals(wxString(expected), wxString(actual), sourceLine, message);
}
inline void inline void
assertEquals(const char *expected, assertEquals(const char *expected,
const wxString& actual, const wxString& actual,

4
tests/strings/crt.cpp
View File

@@ -207,8 +207,8 @@ void CrtTestCase::Strpbrk()
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX.c_str(), s.mb_str()) ); CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX.c_str(), s.mb_str()) );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWX.c_str(), s.wc_str()) ); CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWX.c_str(), s.wc_str()) );
CPPUNIT_ASSERT_EQUAL( (char *)NULL, wxStrpbrk(strWX, "xyz") ); CPPUNIT_ASSERT( !wxStrpbrk(strWX, "xyz") );
CPPUNIT_ASSERT_EQUAL( (wchar_t *)NULL, wxStrpbrk(strWX.c_str(), L"xyz") ); CPPUNIT_ASSERT( !wxStrpbrk(strWX.c_str(), L"xyz") );
} }
void CrtTestCase::Strnlen() void CrtTestCase::Strnlen()

4
tests/strings/strings.cpp
View File

@@ -943,9 +943,9 @@ void StringTestCase::ScopedBuffers()
// but assigning it to wxCharBuffer makes a full copy // but assigning it to wxCharBuffer makes a full copy
wxCharBuffer buf(sbuf); wxCharBuffer buf(sbuf);
CPPUNIT_ASSERT( buf.data() != literal ); CPPUNIT_ASSERT( buf.data() != literal );
CPPUNIT_ASSERT_EQUAL( literal, buf ); CPPUNIT_ASSERT_EQUAL( literal, buf.data() );
wxCharBuffer buf2 = sbuf; wxCharBuffer buf2 = sbuf;
CPPUNIT_ASSERT( buf2.data() != literal ); CPPUNIT_ASSERT( buf2.data() != literal );
CPPUNIT_ASSERT_EQUAL( literal, buf ); CPPUNIT_ASSERT_EQUAL( literal, buf.data() );
} }