CPPUNIT_TEST( CharPrintf );
#if wxUSE_STD_STRING
CPPUNIT_TEST( StdString );
+#endif
+#if wxUSE_LONGLONG
+ CPPUNIT_TEST( LongLongPrintf );
#endif
CPPUNIT_TEST( Sscanf );
CPPUNIT_TEST( RepeatedPrintf );
void CharPrintf();
#if wxUSE_STD_STRING
void StdString();
+#endif
+#if wxUSE_LONGLONG
+ void LongLongPrintf();
#endif
void Sscanf();
void RepeatedPrintf();
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( VarArgTestCase );
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VarArgTestCase, "VarArgTestCase" );
void VarArgTestCase::StringPrintf()
}
#endif // wxUSE_STD_STRING
+#if wxUSE_LONGLONG
+void VarArgTestCase::LongLongPrintf()
+{
+ const char * const llfmt = "%" wxLongLongFmtSpec "d";
+
+ CPPUNIT_ASSERT_EQUAL( "17", wxString::Format(llfmt, wxLL(17)) );
+
+ wxLongLong ll = 1234567890;
+ CPPUNIT_ASSERT_EQUAL( "1234567890", wxString::Format(llfmt, ll) );
+}
+#endif // wxUSE_LONGLONG
+
void VarArgTestCase::Sscanf()
{
int i = 0;
// check size_t handling
size_t len = sizeof(*this);
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
wxString::Format("%Iu", len);
#else
wxString::Format("%zu", len);