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

use WX_ASSERT_STR/SIZET_EQUAL instead of CPPUNIT_ASSERT_EQUAL with casts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-08-30 20:21:49 +00:00
parent 6cf1cf9e6d
commit c2c87924e7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/strings/strings.cpp
View File

@@ -204,7 +204,7 @@ void StringTestCase::Extraction()
#define TEST_STARTS_WITH(prefix, correct_rest, result) \ #define TEST_STARTS_WITH(prefix, correct_rest, result) \
CPPUNIT_ASSERT_EQUAL(result, s.StartsWith(prefix, &rest)); \ CPPUNIT_ASSERT_EQUAL(result, s.StartsWith(prefix, &rest)); \
if ( result ) \ if ( result ) \
CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest) WX_ASSERT_STR_EQUAL(correct_rest, rest)
TEST_STARTS_WITH( _T("Hello"), _T(", world!"), true ); TEST_STARTS_WITH( _T("Hello"), _T(", world!"), true );
TEST_STARTS_WITH( _T("Hello, "), _T("world!"), true ); TEST_STARTS_WITH( _T("Hello, "), _T("world!"), true );
@@ -223,7 +223,7 @@ void StringTestCase::Extraction()
#define TEST_ENDS_WITH(suffix, correct_rest, result) \ #define TEST_ENDS_WITH(suffix, correct_rest, result) \
CPPUNIT_ASSERT_EQUAL(result, s.EndsWith(suffix, &rest)); \ CPPUNIT_ASSERT_EQUAL(result, s.EndsWith(suffix, &rest)); \
if ( result ) \ if ( result ) \
CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest) WX_ASSERT_STR_EQUAL(correct_rest, rest)
TEST_ENDS_WITH( _T(""), _T("Hello, world!"), true ); TEST_ENDS_WITH( _T(""), _T("Hello, world!"), true );
TEST_ENDS_WITH( _T("!"), _T("Hello, world"), true ); TEST_ENDS_WITH( _T("!"), _T("Hello, world"), true );
@@ -274,7 +274,7 @@ void StringTestCase::Replace()
{ \ { \
wxString s = original; \ wxString s = original; \
s.replace( pos , len , replacement ); \ s.replace( pos , len , replacement ); \
CPPUNIT_ASSERT( s == result ); \ WX_ASSERT_STR_EQUAL( result, s ); \
} }
TEST_REPLACE( _T("012-AWORD-XYZ"), 4, 5, _T("BWORD"), _T("012-BWORD-XYZ") ); TEST_REPLACE( _T("012-AWORD-XYZ"), 4, 5, _T("BWORD"), _T("012-BWORD-XYZ") );
@@ -660,7 +660,7 @@ void StringTestCase::WriteBuf()
CPPUNIT_ASSERT(_T('f') == s[0u]); CPPUNIT_ASSERT(_T('f') == s[0u]);
CPPUNIT_ASSERT(_T('o') == s[1]); CPPUNIT_ASSERT(_T('o') == s[1]);
CPPUNIT_ASSERT(_T('o') == s[2]); CPPUNIT_ASSERT(_T('o') == s[2]);
CPPUNIT_ASSERT_EQUAL((size_t)3, s.length()); WX_ASSERT_SIZET_EQUAL(3, s.length());
{ {
@@ -673,7 +673,7 @@ void StringTestCase::WriteBuf()
CPPUNIT_ASSERT(_T('a') == s[1]); CPPUNIT_ASSERT(_T('a') == s[1]);
CPPUNIT_ASSERT(_T('r') == s[2]); CPPUNIT_ASSERT(_T('r') == s[2]);
CPPUNIT_ASSERT(_T('r') == s[3]); CPPUNIT_ASSERT(_T('r') == s[3]);
CPPUNIT_ASSERT_EQUAL((size_t)4, s.length()); WX_ASSERT_SIZET_EQUAL(4, s.length());
CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) ); CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) );
} }