revert debugging modifications and build into test.exe all non-GUI tests

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

diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp
index ec963c9fd1efeae6613212ee6b8518481310c2b8..015480e869961796ce1a3fafdeca9582a627323d 100644 (file)
--- a/tests/strings/vsnprintf.cpp
+++ b/tests/strings/vsnprintf.cpp
@@ -19,6 +19,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/crt.h"
+
+#if wxUSE_WXVSNPRINTF
+

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
     #include "wx/wxchar.h"
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
     #include "wx/wxchar.h"


@@ -41,9 +45,9 @@
 static wxChar buf[MAX_TEST_LEN];
 int r;
 
 static wxChar buf[MAX_TEST_LEN];
 int r;
 

-// these macros makes it possible to write all tests without repeating a lot 
+// these macros makes it possible to write all tests without repeating a lot

 // of times the wxT() macro
 // of times the wxT() macro

-// NOTE: you should use expected strings with these macros which do not exceed 
+// NOTE: you should use expected strings with these macros which do not exceed

 //       MAX_TEST_LEN as these macro do check if the return value is == (int)wxStrlen(buf)
 
 #define ASSERT_STR_EQUAL( a, b ) \
 //       MAX_TEST_LEN as these macro do check if the return value is == (int)wxStrlen(buf)
 
 #define ASSERT_STR_EQUAL( a, b ) \


@@ -78,7 +82,25 @@ int r;
     CPPUNIT_ASSERT_EQUAL( wxString(wxT(expected)).Left(size - 1),   \
                           wxString(buffer) )
 
     CPPUNIT_ASSERT_EQUAL( wxString(wxT(expected)).Left(size - 1),   \
                           wxString(buffer) )
 

+// this is the same as wxSnprintf() but it passes the format string to
+// wxVsnprintf() without using ATTRIBUTE_PRINTF and thus suppresses the gcc
+// checks (and resulting warnings) for the format string
+//
+// use with extreme care and only when you're really sure the warnings must be
+// suppressed!
+template<typename T>
+static int
+wxUnsafeSnprintf(T *buf, size_t len, const wxChar *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+
+    int rc = wxVsnprintf(buf, len, fmt, args);
+
+    va_end(args);

 
 

+    return rc;
+}

 
 // ----------------------------------------------------------------------------
 // test class
 
 // ----------------------------------------------------------------------------
 // test class


@@ -136,7 +158,7 @@ private:
     void WrongFormatStrings();
 #endif // wxUSE_WXVSNPRINTF
     void Miscellaneous();
     void WrongFormatStrings();
 #endif // wxUSE_WXVSNPRINTF
     void Miscellaneous();

-    void Misc(wxChar *buffer, int size);
+    template<typename T> void Misc(T *buffer, int size);

 
     // compares the expectedString and the result of wxVsnprintf() char by char
     // for all its lenght (not only for first expectedLen chars) and also
 
     // compares the expectedString and the result of wxVsnprintf() char by char
     // for all its lenght (not only for first expectedLen chars) and also


@@ -358,12 +380,13 @@ void VsnprintfTestCase::LongLong()
 
 #ifdef __WXMSW__
     CMP3("123456789", "%I64d", (wxLongLong_t)123456789);
 
 #ifdef __WXMSW__
     CMP3("123456789", "%I64d", (wxLongLong_t)123456789);

-    CMP3("123456789abcdef", "%I64x", (wxLongLong_t)0x123456789abcdef);
+    CMP3("123456789abcdef", "%I64x", wxLL(0x123456789abcdef));

 #endif
 }
 #endif
 
 #endif
 }
 #endif
 

-void VsnprintfTestCase::Misc(wxChar *buffer, int size)
+template<typename T>
+void VsnprintfTestCase::Misc(T *buffer, int size)

 {
     // Remember that wx*printf could be mapped either to system
     // implementation or to wx implementation.
 {
     // Remember that wx*printf could be mapped either to system
     // implementation or to wx implementation.


@@ -376,7 +399,7 @@ void VsnprintfTestCase::Misc(wxChar *buffer, int size)
     //
     // Note that in the second case (i.e. when we're using our own implementation),
     // wxVsnprintf() will return the number of characters written in the standard
     //
     // Note that in the second case (i.e. when we're using our own implementation),
     // wxVsnprintf() will return the number of characters written in the standard

-    // output or 
+    // output or

     //   -1         if there was an error in the format string
     //   maxSize+1  if the output buffer is too small
 
     //   -1         if there was an error in the format string
     //   maxSize+1  if the output buffer is too small
 


@@ -393,16 +416,18 @@ void VsnprintfTestCase::Misc(wxChar *buffer, int size)
 #endif
 
     // test unicode/ansi conversion specifiers
 #endif
 
     // test unicode/ansi conversion specifiers

-    // NB: this line will output two warnings like these, on GCC:
-    //     warning: use of 'h' length modifier with 's' type character (i.e.
-    //     GCC warns you that 'h' is not legal on 's' conv spec) but they must
-    //     be ignored as here we explicitely want to test the wxSnprintf()
-    //     behaviour in such case
-
-    CMPTOSIZE(buffer, size,
-              "unicode string: unicode!! W - ansi string: ansi!! w\n\n",
-              "unicode string: %ls %lc - ansi string: %hs %hc\n\n",
-              L"unicode!!", L'W', "ansi!!", 'w');
+    //
+    // NB: we use wxUnsafeSnprintf() as %hs and %hc are invalid in printf
+    //     format and gcc would warn about this otherwise
+
+    r = wxUnsafeSnprintf(buffer, size,
+                         _T("unicode string: %ls %lc - ansi string: %hs %hc\n\n"),
+                         L"unicode!!", L'W', "ansi!!", 'w');
+    CPPUNIT_ASSERT( r != -1 );
+    CPPUNIT_ASSERT_EQUAL(
+        wxString(wxT("unicode string: unicode!! W - ansi string: ansi!! w\n\n")).Left(size - 1),
+        wxString(buffer)
+    );

 }
 
 
 }
 
 


@@ -442,12 +467,22 @@ void VsnprintfTestCase::WrongFormatStrings()
 
 void VsnprintfTestCase::BigToSmallBuffer()
 {
 
 void VsnprintfTestCase::BigToSmallBuffer()
 {

-    wxChar buf[1024], buf2[16], buf3[4], buf4;
-
-    Misc(buf, 1024);
-    Misc(buf2, 16);
-    Misc(buf3, 4);
-    Misc(&buf4, 1);
+    // VC6 can't compile this code
+#if !defined(__VISUALC__) || (__VISUALC__ >= 1310)
+#if wxUSE_UNICODE
+    wchar_t bufw[1024], bufw2[16], bufw3[4], bufw4;
+    Misc(bufw, 1024);
+    Misc(bufw2, 16);
+    Misc(bufw3, 4);
+    Misc(&bufw4, 1);
+#endif // wxUSE_UNICODE
+
+    char bufa[1024], bufa2[16], bufa3[4], bufa4;
+    Misc(bufa, 1024);
+    Misc(bufa2, 16);
+    Misc(bufa3, 4);
+    Misc(&bufa4, 1);
+#endif // !VC6

 }
 
 void VsnprintfTestCase::DoMisc(
 }
 
 void VsnprintfTestCase::DoMisc(


@@ -468,7 +503,7 @@ void VsnprintfTestCase::DoMisc(
 
     va_list ap;
     va_start(ap, format);
 
     va_list ap;
     va_start(ap, format);

-    
+

     int n = wxVsnprintf(buf, max, format, ap);
 
     va_end(ap);
     int n = wxVsnprintf(buf, max, format, ap);
 
     va_end(ap);


@@ -518,3 +553,5 @@ void VsnprintfTestCase::Miscellaneous()
     DoMisc(5, wxT("%%%%%"), 6,  wxT("%%%%%%%%%%"));
     DoMisc(6, wxT("%%%%12"), 7,  wxT("%%%%%%%%%d"), 12);
 }
     DoMisc(5, wxT("%%%%%"), 6,  wxT("%%%%%%%%%%"));
     DoMisc(6, wxT("%%%%12"), 7,  wxT("%%%%%%%%%d"), 12);
 }

+
+#endif // wxUSE_WXVSNPRINTF