use size_t for the total size of data instead of wxFileSize_t (msg catalogs can't...

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index d236d478e55d237697ac8912a03e4e9c711a1156..2cf63e644fe30708f328eeeeb0c35f3df53138e1 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -47,6 +47,7 @@ private:
         CPPUNIT_TEST( Extraction );
         CPPUNIT_TEST( Find );
         CPPUNIT_TEST( Tokenizer );
+        CPPUNIT_TEST( TokenizerGetPosition );
         CPPUNIT_TEST( Replace );
         CPPUNIT_TEST( Match );
         CPPUNIT_TEST( CaseChanges );
@@ -66,6 +67,7 @@ private:
     void Find();
     void SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode );
     void Tokenizer();
+    void TokenizerGetPosition();
     void Replace();
     void Match();
     void CaseChanges();
@@ -154,11 +156,11 @@ void StringTestCase::Constructors()
 void StringTestCase::ConstructorsWithConversion()
 {
     // Déj`a in UTF-8 and wchar_t:
-    const char utf8[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0};
+    const unsigned char utf8[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0};
     const wchar_t wchar[] = {0x44,0xE9,0x6A,0xE0,0};
-    const char utf8sub[] = {0x44,0xC3,0xA9,0x6A,0}; // "Dej"
+    const unsigned char utf8sub[] = {0x44,0xC3,0xA9,0x6A,0}; // "Dej"
 
-    wxString s1(utf8, wxConvUTF8);
+    wxString s1((char *)utf8, wxConvUTF8);
     wxString s2(wchar, wxConvUTF8);
 
 #if wxUSE_UNICODE
@@ -169,8 +171,8 @@ void StringTestCase::ConstructorsWithConversion()
     CPPUNIT_ASSERT( s2 == utf8 );
 #endif
 
-    wxString sub(utf8sub, wxConvUTF8); // "Dej" substring
-    wxString s3(utf8, wxConvUTF8, 4);
+    wxString sub((char *)utf8sub, wxConvUTF8); // "Dej" substring
+    wxString s3((char *)utf8, wxConvUTF8, 4);
     wxString s4(wchar, wxConvUTF8, 3);
 
     CPPUNIT_ASSERT( s3 == sub );
@@ -302,6 +304,44 @@ void StringTestCase::Tokenizer()
     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 ) \