fixed variadic templates in the case when char value is passed in place of (e.g.) %i or %d argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,6 +36,7 @@ public:
|
||||
private:
|
||||
CPPUNIT_TEST_SUITE( VarArgTestCase );
|
||||
CPPUNIT_TEST( StringPrintf );
|
||||
CPPUNIT_TEST( CharPrintf );
|
||||
#if wxUSE_STD_STRING
|
||||
CPPUNIT_TEST( StdString );
|
||||
#endif
|
||||
@@ -43,6 +44,7 @@ private:
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
void StringPrintf();
|
||||
void CharPrintf();
|
||||
#if wxUSE_STD_STRING
|
||||
void StdString();
|
||||
#endif
|
||||
@@ -91,7 +93,34 @@ void VarArgTestCase::StringPrintf()
|
||||
// literal:
|
||||
bool cond = true;
|
||||
s2.Printf(_T("foo %s"), !cond ? s.c_str() : _T("bar"));
|
||||
}
|
||||
|
||||
void VarArgTestCase::CharPrintf()
|
||||
{
|
||||
wxString foo("foo");
|
||||
wxString s;
|
||||
|
||||
// test using wchar_t:
|
||||
s.Printf("char=%c", L'c');
|
||||
WX_ASSERT_STR_EQUAL( "char=c", s );
|
||||
|
||||
// test wxUniCharRef:
|
||||
s.Printf("string[1] is %c", foo[1]);
|
||||
WX_ASSERT_STR_EQUAL( "string[1] is o", s );
|
||||
|
||||
// test char
|
||||
char c = 'z';
|
||||
s.Printf("%c to %c", 'a', c);
|
||||
WX_ASSERT_STR_EQUAL( "a to z", s );
|
||||
|
||||
// test char used as integer:
|
||||
c = 240;
|
||||
s.Printf("value is %i (int)", c);
|
||||
WX_ASSERT_STR_EQUAL( wxString("value is -16 (int)"), s );
|
||||
|
||||
unsigned char u = 240;
|
||||
s.Printf("value is %i (int)", u);
|
||||
WX_ASSERT_STR_EQUAL( wxString("value is 240 (int)"), s );
|
||||
}
|
||||
|
||||
#if wxUSE_STD_STRING
|
||||
|
Reference in New Issue
Block a user