Format strings fixes in test suite.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2010-06-24 10:34:23 +00:00
parent 0f895b0cf5
commit 38914d5a51
2 changed files with 4 additions and 4 deletions

View File

@@ -721,7 +721,7 @@ void DateTimeTestCase::TestTimeFormat()
{ {
// conversion failed - should it have? // conversion failed - should it have?
WX_ASSERT_MESSAGE( WX_ASSERT_MESSAGE(
("Test #%lu failed: failed to parse \"%s\"", n, s), ("Test #%u failed: failed to parse \"%s\"", n, s),
kind == CompareNone kind == CompareNone
); );
} }
@@ -735,7 +735,7 @@ void DateTimeTestCase::TestTimeFormat()
result++; result++;
WX_ASSERT_MESSAGE( WX_ASSERT_MESSAGE(
("Test #%lu failed: \"%s\" was left unparsed in \"%s\"", ("Test #%u failed: \"%s\" was left unparsed in \"%s\"",
n, result, s), n, result, s),
!*result !*result
); );

View File

@@ -177,9 +177,9 @@ void VarArgTestCase::RepeatedPrintf()
*p = 'i'; *p = 'i';
wxString s; wxString s;
s = wxString::Format("buffer %s, len %d", buffer, wxStrlen(buffer)); s = wxString::Format("buffer %s, len %d", buffer, (int)wxStrlen(buffer));
CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s); CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
s = wxString::Format("buffer %s, len %d", buffer, wxStrlen(buffer)); s = wxString::Format("buffer %s, len %d", buffer, (int)wxStrlen(buffer));
CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s); CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
} }