#define CMP6(expected, fmt, y, z, w, t) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w, t); \
- CPPUNIT_ASSERT( r == (int)wxStrlen(buf) ); \
+ CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP5(expected, fmt, y, z, w) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w); \
- CPPUNIT_ASSERT( r == (int)wxStrlen(buf) ); \
+ CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP4(expected, fmt, y, z) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z); \
- CPPUNIT_ASSERT( r == (int)wxStrlen(buf) ); \
+ CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP3(expected, fmt, y) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y); \
- CPPUNIT_ASSERT( r == (int)wxStrlen(buf) ); \
+ CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP2(expected, fmt) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt)); \
- CPPUNIT_ASSERT( r == (int)wxStrlen(buf) ); \
+ CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf );
// NOTE: this macro is used also with too-small buffers (see Miscellaneous())
CPPUNIT_TEST( WrongFormatStrings );
#endif // wxUSE_WXVSNPRINTF
CPPUNIT_TEST( Miscellaneous );
+ CPPUNIT_TEST( GlibcMisc1 );
+ CPPUNIT_TEST( GlibcMisc2 );
CPPUNIT_TEST_SUITE_END();
void C();
size_t max, const wxChar *format, ...);
void Miscellaneous();
+ void GlibcMisc1();
+ void GlibcMisc2();
+
DECLARE_NO_COPY_CLASS(VsnprintfTestCase)
};
{
int nchar;
- wxSnprintf(buf, MAX_TEST_LEN, _T("%d %s%n\n"), 3, _T("bears"), &nchar);
+ wxSnprintf(buf, MAX_TEST_LEN, wxT("%d %s%n\n"), 3, wxT("bears"), &nchar);
CPPUNIT_ASSERT_EQUAL( 7, nchar );
}
// format and gcc would warn about this otherwise
r = wxUnsafeSnprintf(buffer, size,
- _T("unicode string/char: %ls/%lc -- ansi string/char: %hs/%hc"),
+ wxT("unicode string/char: %ls/%lc -- ansi string/char: %hs/%hc"),
L"unicode", L'U', "ansi", 'A');
wxString expected =
wxString(wxT("unicode string/char: unicode/U -- ansi string/char: ansi/A")).Left(size - 1);
// Prepare messages so that it is possible to see from the error which
// test was running.
wxString errStr, overflowStr;
- errStr << _T("No.: ") << ++count << _T(", expected: ") << expectedLen
- << _T(" '") << expectedString << _T("', result: ");
- overflowStr << errStr << _T("buffer overflow");
- errStr << n << _T(" '") << buf << _T("'");
+ errStr << wxT("No.: ") << ++count << wxT(", expected: ") << expectedLen
+ << wxT(" '") << expectedString << wxT("', result: ");
+ overflowStr << errStr << wxT("buffer overflow");
+ errStr << n << wxT(" '") << buf << wxT("'");
// turn them into std::strings
std::string errMsg(errStr.mb_str());
DoMisc(6, wxT("%%%%12"), 7, wxT("%%%%%%%%%d"), 12);
}
+
+/* (C) Copyright C E Chew
+*
+* Feel free to copy, use and distribute this software provided:
+*
+* 1. you do not pretend that you wrote it
+* 2. you leave this copyright notice intact.
+*/
+
+void VsnprintfTestCase::GlibcMisc1()
+{
+ CMP3(" ", "%5.s", "xyz");
+ CMP3(" 33", "%5.f", 33.3);
+#if defined(__VISUALC__)
+ // see the previous notes about the minimum width of mantissa:
+ CMP3(" 3e+008", "%8.e", 33.3e7);
+ CMP3(" 3E+008", "%8.E", 33.3e7);
+ CMP3("3e+001", "%.g", 33.3);
+ CMP3("3E+001", "%.G", 33.3);
+#else
+ CMP3(" 3e+08", "%8.e", 33.3e7);
+ CMP3(" 3E+08", "%8.E", 33.3e7);
+ CMP3("3e+01", "%.g", 33.3);
+ CMP3("3E+01", "%.G", 33.3);
+#endif
+}
+
+void VsnprintfTestCase::GlibcMisc2()
+{
+ int prec;
+ wxString test_format;
+
+ prec = 0;
+ CMP4("3", "%.*g", prec, 3.3);
+
+ prec = 0;
+ CMP4("3", "%.*G", prec, 3.3);
+
+ prec = 0;
+ CMP4(" 3", "%7.*G", prec, 3.33);
+
+ prec = 3;
+ CMP4(" 041", "%04.*o", prec, 33);
+
+ prec = 7;
+ CMP4(" 0000033", "%09.*u", prec, 33);
+
+ prec = 3;
+ CMP4(" 021", "%04.*x", prec, 33);
+
+ prec = 3;
+ CMP4(" 021", "%04.*X", prec, 33);
+}
+
#endif // wxUSE_WXVSNPRINTF
+