Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / tests / strings / vararg.cpp

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index b4eec3c83408aa9470ed373b14125a7bb56b692b..df44cffffa630f6014f4611449822d057aae04e8 100644 (file)
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -39,6 +39,9 @@ private:
         CPPUNIT_TEST( CharPrintf );
 #if wxUSE_STD_STRING
         CPPUNIT_TEST( StdString );
         CPPUNIT_TEST( CharPrintf );
 #if wxUSE_STD_STRING
         CPPUNIT_TEST( StdString );

+#endif
+#if wxUSE_LONGLONG
+        CPPUNIT_TEST( LongLongPrintf );

 #endif
         CPPUNIT_TEST( Sscanf );
         CPPUNIT_TEST( RepeatedPrintf );
 #endif
         CPPUNIT_TEST( Sscanf );
         CPPUNIT_TEST( RepeatedPrintf );


@@ -49,6 +52,9 @@ private:
     void CharPrintf();
 #if wxUSE_STD_STRING
     void StdString();
     void CharPrintf();
 #if wxUSE_STD_STRING
     void StdString();

+#endif
+#if wxUSE_LONGLONG
+    void LongLongPrintf();

 #endif
     void Sscanf();
     void RepeatedPrintf();
 #endif
     void Sscanf();
     void RepeatedPrintf();


@@ -60,7 +66,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( VarArgTestCase );
 
 // 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()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VarArgTestCase, "VarArgTestCase" );
 
 void VarArgTestCase::StringPrintf()


@@ -152,6 +158,18 @@ void VarArgTestCase::StdString()
 }
 #endif // wxUSE_STD_STRING
 
 }
 #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;
 void VarArgTestCase::Sscanf()
 {
     int i = 0;


@@ -254,7 +272,7 @@ void VarArgTestCase::ArgsValidation()
 
     // check size_t handling
     size_t len = sizeof(*this);
 
     // check size_t handling
     size_t len = sizeof(*this);

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     wxString::Format("%Iu", len);
 #else
     wxString::Format("%zu", len);
     wxString::Format("%Iu", len);
 #else
     wxString::Format("%zu", len);