Added missing includes

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 090b49aaab6828322eb9b5fecba52ce5161d191d..3e25c70f4845cd9dc7f912d8f939d0e522a621f9 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -21,8 +21,6 @@
     #include "wx/wx.h"
 #endif // WX_PRECOMP
 
-#include "wx/tokenzr.h"
-
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
@@ -46,8 +44,6 @@ private:
 #endif // wxUSE_WCHAR_T
         CPPUNIT_TEST( Extraction );
         CPPUNIT_TEST( Find );
-        CPPUNIT_TEST( Tokenizer );
-        CPPUNIT_TEST( TokenizerGetPosition );
         CPPUNIT_TEST( Replace );
         CPPUNIT_TEST( Match );
         CPPUNIT_TEST( CaseChanges );
@@ -70,9 +66,6 @@ private:
 #endif // wxUSE_WCHAR_T
     void Extraction();
     void Find();
-    void SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode );
-    void Tokenizer();
-    void TokenizerGetPosition();
     void Replace();
     void Match();
     void CaseChanges();
@@ -148,6 +141,15 @@ void StringTestCase::Format()
     CPPUNIT_ASSERT( s1 == wxString::Format(_T("%03d"), 18) );
     s2.Printf(_T("Number 18: %s\n"), s1.c_str());
     CPPUNIT_ASSERT( s2 == wxString::Format(_T("Number 18: %s\n"), s1.c_str()) );
+
+    static const size_t lengths[] = { 1, 512, 1024, 1025, 2048, 4096, 4097 };
+    for ( size_t n = 0; n < WXSIZEOF(lengths); n++ )
+    {
+        const size_t len = lengths[n];
+
+        wxString s(_T('Z'), len);
+        CPPUNIT_ASSERT_EQUAL( len, wxString::Format(_T("%s"), s.c_str()).length());
+    }
 }
 
 void StringTestCase::Constructors()
@@ -371,98 +373,6 @@ void StringTestCase::Find()
     #undef TEST_FIND
 }
 
-void StringTestCase::SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode )
-{
-    wxStringTokenizer tkz( str, delims, mode);
-    CPPUNIT_ASSERT( tkz.CountTokens() == count );
-
-    wxChar *buf, *s = NULL, *last;
-
-    if ( tkz.GetMode() == wxTOKEN_STRTOK )
-    {
-        buf = new wxChar[wxStrlen(str) + 1];
-        wxStrcpy(buf, str);
-        s = wxStrtok(buf, delims, &last);
-    }
-    else
-    {
-        buf = NULL;
-    }
-
-    size_t count2 = 0;
-    while ( tkz.HasMoreTokens() )
-    {
-        wxString token = tkz.GetNextToken();
-        if ( buf )
-        {
-            CPPUNIT_ASSERT( token == s );
-            s = wxStrtok(NULL, delims, &last);
-        }
-        count2++;
-    }
-
-    CPPUNIT_ASSERT( count2 == count );
-    if ( buf )
-    {
-        delete [] buf;
-    }
-}
-
-void StringTestCase::Tokenizer()
-{
-    SingleTokenizerTest( _T(""),                                           _T(" "),              0, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("Hello, world"),                               _T(" "),              2, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("Hello,   world  "),                           _T(" "),              2, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("Hello, world"),                               _T(","),              2, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("Hello, world!"),                              _T(",!"),             2, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("Hello,, world!"),                             _T(",!"),             3, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("Hello, world!"),                              _T(",!"),             3, wxTOKEN_RET_EMPTY_ALL );
-    SingleTokenizerTest( _T("username:password:uid:gid:gecos:home:shell"), _T(":"),              7, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("1 \t3\t4  6   "),                             wxDEFAULT_DELIMITERS, 4, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("1 \t3\t4  6   "),                             wxDEFAULT_DELIMITERS, 6, wxTOKEN_RET_EMPTY     );
-    SingleTokenizerTest( _T("1 \t3\t4  6   "),                             wxDEFAULT_DELIMITERS, 9, wxTOKEN_RET_EMPTY_ALL );
-    SingleTokenizerTest( _T("01/02/99"),                                   _T("/-"),             3, wxTOKEN_DEFAULT       );
-    SingleTokenizerTest( _T("01-02/99"),                                   _T("/-"),             3, wxTOKEN_RET_DELIMS    );
-}
-
-// call this with the string to tokenize, delimeters to use and the expected
-// positions (i.e. results of GetPosition()) after each GetNextToken() call,
-// terminate positions with 0
-static void DoTokenizerGetPosition(const wxChar *s, 
-                                   const wxChar *delims, int pos, ...)
-{
-    wxStringTokenizer tkz(s, delims);
-
-    CPPUNIT_ASSERT( tkz.GetPosition() == 0 );
-
-    va_list ap;
-    va_start(ap, pos);
-
-    for ( ;; )
-    {
-        if ( !pos )
-        {
-            CPPUNIT_ASSERT( !tkz.HasMoreTokens() );
-            break;
-        }
-
-        tkz.GetNextToken();
-
-        CPPUNIT_ASSERT( tkz.GetPosition() == (size_t)pos );
-
-        pos = va_arg(ap, int);
-    }
-
-    va_end(ap);
-}
-
-void StringTestCase::TokenizerGetPosition()
-{
-    DoTokenizerGetPosition(_T("foo"), _T("_"), 3, 0);
-    DoTokenizerGetPosition(_T("foo_bar"), _T("_"), 4, 7, 0);
-    DoTokenizerGetPosition(_T("foo_bar_"), _T("_"), 4, 8, 0);
-}
-
 void StringTestCase::Replace()
 {
     #define TEST_REPLACE( original , pos , len , replacement , result ) \
@@ -549,8 +459,11 @@ void StringTestCase::CaseChanges()
     if ( locRu.IsOk() )
     {
         // try upper casing 8bit strings
-        wxString sUpper("\xdf"),
-                 sLower("\xff");
+        const wchar_t capital_ya[] = { 0x42f, 0 },
+                      small_ya[]   = { 0x44f, 0 };
+
+        wxString sUpper(wxConvLibc.cWC2MB(capital_ya)),
+                 sLower(wxConvLibc.cWC2MB(small_ya));
 
         CPPUNIT_ASSERT( sUpper.Lower() == sLower );
         CPPUNIT_ASSERT( sLower.Upper() == sUpper );