X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb6cb2079398cd74e98627c9065454e338cb1e6c..ff8af61ce07803bd86cafea25a06915dfed2ce36:/tests/strings/vararg.cpp

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index de259e3534..df44cffffa 100644
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -36,17 +36,29 @@ public:
 private:
     CPPUNIT_TEST_SUITE( VarArgTestCase );
         CPPUNIT_TEST( StringPrintf );
+        CPPUNIT_TEST( CharPrintf );
 #if wxUSE_STD_STRING
         CPPUNIT_TEST( StdString );
+#endif
+#if wxUSE_LONGLONG
+        CPPUNIT_TEST( LongLongPrintf );
 #endif
         CPPUNIT_TEST( Sscanf );
+        CPPUNIT_TEST( RepeatedPrintf );
+        CPPUNIT_TEST( ArgsValidation );
     CPPUNIT_TEST_SUITE_END();
 
     void StringPrintf();
+    void CharPrintf();
 #if wxUSE_STD_STRING
     void StdString();
+#endif
+#if wxUSE_LONGLONG
+    void LongLongPrintf();
 #endif
     void Sscanf();
+    void RepeatedPrintf();
+    void ArgsValidation();
 
     DECLARE_NO_COPY_CLASS(VarArgTestCase)
 };
@@ -54,7 +66,7 @@ private:
 // 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()
@@ -64,34 +76,69 @@ void VarArgTestCase::StringPrintf()
     // test passing literals:
     s.Printf("%s %i", "foo", 42);
     CPPUNIT_ASSERT( s == "foo 42" );
-    s.Printf("%s %s %i", _T("bar"), "=", 11);
+    s.Printf("%s %s %i", wxT("bar"), "=", 11);
 
     // test passing c_str():
     CPPUNIT_ASSERT( s == "bar = 11" );
     s2.Printf("(%s)", s.c_str());
     CPPUNIT_ASSERT( s2 == "(bar = 11)" );
-    s2.Printf(_T("[%s](%s)"), s.c_str(), "str");
+    s2.Printf(wxT("[%s](%s)"), s.c_str(), "str");
     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     s2.Printf("%s mailbox", wxString("Opening").c_str());
     CPPUNIT_ASSERT( s2 == "Opening mailbox" );
 
     // test passing wxString directly:
-    s2.Printf(_T("[%s](%s)"), s, "str");
+    s2.Printf(wxT("[%s](%s)"), s, "str");
     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     // test passing wxCharBufferType<T>:
     s = "FooBar";
-    s2.Printf(_T("(%s)"), s.mb_str());
+    s2.Printf(wxT("(%s)"), s.mb_str());
     CPPUNIT_ASSERT( s2 == "(FooBar)" );
-    s2.Printf(_T("value=%s;"), s.wc_str());
+    s2.Printf(wxT("value=%s;"), s.wc_str());
     CPPUNIT_ASSERT( s2 == "value=FooBar;" );
 
     // this tests correct passing of wxCStrData constructed from string
     // literal:
     bool cond = true;
-    s2.Printf(_T("foo %s"), !cond ? s.c_str() : _T("bar"));
+    s2.Printf(wxT("foo %s"), !cond ? s.c_str() : wxT("bar"));
+}
+
+void VarArgTestCase::CharPrintf()
+{
+    wxString foo("foo");
+    wxString s;
+
+    // test using wchar_t:
+    s.Printf("char=%c", L'c');
+    CPPUNIT_ASSERT_EQUAL( "char=c", s );
+
+    // test wxUniCharRef:
+    s.Printf("string[1] is %c", foo[1]);
+    CPPUNIT_ASSERT_EQUAL( "string[1] is o", s );
+
+    // test char
+    char c = 'z';
+    s.Printf("%c to %c", 'a', c);
+    CPPUNIT_ASSERT_EQUAL( "a to z", s );
+
+    // test char used as integer:
+    #ifdef _MSC_VER
+        #pragma warning(disable:4305) // truncation of constant value in VC6
+        #pragma warning(disable:4309) // truncation of constant value
+    #endif
+    c = 240;
+    #ifdef _MSC_VER
+        #pragma warning(default:4305) // truncation of constant value in VC6
+        #pragma warning(default:4309)
+    #endif
+    s.Printf("value is %i (int)", c);
+    CPPUNIT_ASSERT_EQUAL( wxString("value is -16 (int)"), s );
 
+    unsigned char u = 240;
+    s.Printf("value is %i (int)", u);
+    CPPUNIT_ASSERT_EQUAL( "value is 240 (int)", s );
 }
 
 #if wxUSE_STD_STRING
@@ -104,13 +151,25 @@ void VarArgTestCase::StdString()
     std::string wc("widechar");
 
     s.Printf("string %s(%i).", mb, 1);
-    CPPUNIT_ASSERT( s == "string multi-byte(1)." );
+    CPPUNIT_ASSERT_EQUAL( "string multi-byte(1).", s );
 
     s.Printf("string %s(%i).", wc, 2);
-    CPPUNIT_ASSERT( s == "string widechar(2)." );
+    CPPUNIT_ASSERT_EQUAL( "string widechar(2).", s );
 }
 #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;
@@ -128,3 +187,94 @@ void VarArgTestCase::Sscanf()
     CPPUNIT_ASSERT( i == 42 );
     CPPUNIT_ASSERT( wxStrcmp(wstr, "test") == 0 );
 }
+
+void VarArgTestCase::RepeatedPrintf()
+{
+    wxCharBuffer buffer(2);
+    char *p = buffer.data();
+    *p = 'h';
+    p++;
+    *p = 'i';
+
+    wxString s;
+    s = wxString::Format("buffer %s, len %d", buffer, (int)wxStrlen(buffer));
+    CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
+
+    s = wxString::Format("buffer %s, len %d", buffer, (int)wxStrlen(buffer));
+    CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
+}
+
+void VarArgTestCase::ArgsValidation()
+{
+    void *ptr = this;
+    int written;
+    short int swritten;
+
+    // these are valid:
+    wxString::Format("a string(%s,%s), ptr %p, int %i",
+                     wxString(), "foo", "char* as pointer", 1);
+
+    // Microsoft has helpfully disabled support for "%n" in their CRT by
+    // default starting from VC8 and somehow even calling
+    // _set_printf_count_output() doesn't help here, so don't use "%n" at all
+    // with it.
+#if wxCHECK_VISUALC_VERSION(8)
+    #define wxNO_PRINTF_PERCENT_N
+#endif // VC8+
+
+    // Similarly, many modern Linux distributions ship with g++ that uses
+    // -D_FORTIFY_SOURCE=2 flag by default and this option prevents "%n" from
+    // being used in a string outside of read-only memory, meaning that it
+    // can't be used in wxString to which we (may, depending on build options)
+    // assign it, so also disable testing of "%n" in this case lest we die with
+    // an abort inside vswprintf().
+#if defined(_FORTIFY_SOURCE)
+    #if _FORTIFY_SOURCE >= 2
+        #define wxNO_PRINTF_PERCENT_N
+    #endif
+#endif
+
+#ifndef wxNO_PRINTF_PERCENT_N
+    wxString::Format("foo%i%n", 42, &written);
+    CPPUNIT_ASSERT_EQUAL( 5, written );
+#endif
+
+    // but these are not:
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("%i: too many arguments", 42, 1, 2, 3) );
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("%i", "foo") );
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("%s", (void*)this) );
+
+    // for some reason assert is not generated with VC6, don't know what's
+    // going there so disable it for now to make the test suite pass when using
+    // this compiler until someone has time to debug this (FIXME-VC6)
+#ifndef __VISUALC6__
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("%d", ptr) );
+#endif
+
+    // we don't check wxNO_PRINTF_PERCENT_N here as these expressions should
+    // result in an assert in our code before the CRT functions are even called
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("foo%i%n", &written) );
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("foo%n", ptr) );
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("foo%i%n", 42, &swritten) );
+
+    // the following test (correctly) fails at compile-time with <type_traits>
+#if !defined(HAVE_TYPE_TRAITS) && !defined(HAVE_TR1_TYPE_TRAITS)
+    wxObject obj;
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("%s", obj) );
+
+    wxObject& ref = obj;
+    WX_ASSERT_FAILS_WITH_ASSERT( wxString::Format("%s", ref) );
+#endif
+
+    // %c should accept integers too
+    wxString::Format("%c", 80);
+    wxString::Format("%c", wxChar(80) + wxChar(1));
+
+    // check size_t handling
+    size_t len = sizeof(*this);
+#ifdef __WINDOWS__
+    wxString::Format("%Iu", len);
+#else
+    wxString::Format("%zu", len);
+#endif
+}