Format strings fixes in test suite.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 9322fe4ef2be4bfc586c19c51bf346c416a69584..90ec18c939fe8900fc80b2e885a3d4af8d91d375 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -721,7 +721,7 @@ void DateTimeTestCase::TestTimeFormat()
             {
                 // conversion failed - should it have?
                 WX_ASSERT_MESSAGE(
             {
                 // conversion failed - should it have?
                 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++;
 
                 WX_ASSERT_MESSAGE(
                     result++;
 
                 WX_ASSERT_MESSAGE(

-                    ("Test #%lu failed: \"%s\" was left unparsed in \"%s\"",
+                    ("Test #%u failed: \"%s\" was left unparsed in \"%s\"",

                      n, result, s),
                     !*result
                 );
                      n, result, s),
                     !*result
                 );

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index f1a3e54ff63667c4f96e34cda4c0bbddfd234e9c..a5677c6c6819044277f53d1554aa3e4c338a728c 100644 (file)
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -177,9 +177,9 @@ void VarArgTestCase::RepeatedPrintf()
     *p = 'i';
 
     wxString s;
     *p = 'i';
 
     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);
 }