X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7788fc4046f6ff5fb6a2ef67906cecc32e7b4df8..197ab43d72571ecfd86c35f1832f063237775648:/tests/arrays/arrays.cpp?ds=inline diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp index c6fa3f3bd4..a5a26644f3 100644 --- a/tests/arrays/arrays.cpp +++ b/tests/arrays/arrays.cpp @@ -82,7 +82,7 @@ public: static size_t GetNumber() { return ms_bars; } - const wxChar *GetName() const { return m_name; } + const wxChar *GetName() const { return m_name.c_str(); } private: wxString m_name; @@ -94,7 +94,7 @@ size_t Bar::ms_bars = 0; WX_DECLARE_OBJARRAY(Bar, ArrayBars); #include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(ArrayBars); +WX_DEFINE_OBJARRAY(ArrayBars) // ---------------------------------------------------------------------------- // helpers for sorting arrays and comparing items @@ -125,14 +125,29 @@ int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second) \ typedef unsigned short ushort; -DEFINE_COMPARE(UShort, ushort); -DEFINE_COMPARE(Int, int); +DEFINE_COMPARE(Char, char) +DEFINE_COMPARE(UShort, ushort) +DEFINE_COMPARE(Int, int) + +WX_DEFINE_ARRAY_CHAR(char, wxArrayChar); +WX_DEFINE_SORTED_ARRAY_CHAR(char, wxSortedArrayCharNoCmp); +WX_DEFINE_SORTED_ARRAY_CMP_CHAR(char, CharCompareValues, wxSortedArrayChar); WX_DEFINE_ARRAY_SHORT(ushort, wxArrayUShort); WX_DEFINE_SORTED_ARRAY_SHORT(ushort, wxSortedArrayUShortNoCmp); WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShort); + WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt); +struct Item +{ + Item(int n_ = 0) : n(n_) { } + + int n; +}; + +WX_DEFINE_ARRAY_PTR(Item *, ItemPtrArray); + // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -145,19 +160,32 @@ public: private: CPPUNIT_TEST_SUITE( ArraysTestCase ); CPPUNIT_TEST( wxStringArrayTest ); + CPPUNIT_TEST( wxStringArraySplitTest ); + CPPUNIT_TEST( wxStringArrayJoinTest ); + CPPUNIT_TEST( wxStringArraySplitJoinTest ); + CPPUNIT_TEST( wxObjArrayTest ); CPPUNIT_TEST( wxArrayUShortTest ); CPPUNIT_TEST( wxArrayIntTest ); + CPPUNIT_TEST( wxArrayCharTest ); CPPUNIT_TEST( TestSTL ); CPPUNIT_TEST( Alloc ); + CPPUNIT_TEST( Clear ); + CPPUNIT_TEST( Swap ); CPPUNIT_TEST_SUITE_END(); void wxStringArrayTest(); + void wxStringArraySplitTest(); + void wxStringArrayJoinTest(); + void wxStringArraySplitJoinTest(); void wxObjArrayTest(); void wxArrayUShortTest(); void wxArrayIntTest(); + void wxArrayCharTest(); void TestSTL(); void Alloc(); + void Clear(); + void Swap(); DECLARE_NO_COPY_CLASS(ArraysTestCase) }; @@ -288,32 +316,186 @@ void ArraysTestCase::wxStringArrayTest() _T("a") ) ); } +void ArraysTestCase::wxStringArraySplitTest() +{ + // test wxSplit: + + { + wxString str = wxT(",,,,first,second,third,,"); + const wxChar *expected[] = + { wxT(""), wxT(""), wxT(""), wxT(""), wxT("first"), + wxT("second"), wxT("third"), wxT(""), wxT("") }; + + wxArrayString exparr(WXSIZEOF(expected), expected); + wxArrayString realarr(wxSplit(str, wxT(','))); + CPPUNIT_ASSERT( exparr == realarr ); + } + + { + wxString str = wxT(",\\,first,second,third,"); + const wxChar *expected[] = + { wxT(""), wxT(",first"), wxT("second"), wxT("third"), wxT("") }; + const wxChar *expected2[] = + { wxT(""), wxT("\\"), wxT("first"), wxT("second"), wxT("third"), wxT("") }; + + // escaping on: + wxArrayString exparr(WXSIZEOF(expected), expected); + wxArrayString realarr(wxSplit(str, wxT(','), wxT('\\'))); + CPPUNIT_ASSERT( exparr == realarr ); + + // escaping turned off: + wxArrayString exparr2(WXSIZEOF(expected2), expected2); + wxArrayString realarr2(wxSplit(str, wxT(','), wxT('\0'))); + CPPUNIT_ASSERT( exparr2 == realarr2 ); + } + + { + // test is escape characters placed before non-separator character are + // just ignored as they should: + wxString str = wxT(",\\,,fir\\st,se\\cond\\,,\\third"); + const wxChar *expected[] = + { wxT(""), wxT(","), wxT("fir\\st"), wxT("se\\cond,"), wxT("\\third") }; + const wxChar *expected2[] = + { wxT(""), wxT("\\"), wxT(""), wxT("fir\\st"), wxT("se\\cond\\"), + wxT(""), wxT("\\third") }; + + // escaping on: + wxArrayString exparr(WXSIZEOF(expected), expected); + wxArrayString realarr(wxSplit(str, wxT(','), wxT('\\'))); + CPPUNIT_ASSERT( exparr == realarr ); + + // escaping turned off: + wxArrayString exparr2(WXSIZEOF(expected2), expected2); + wxArrayString realarr2(wxSplit(str, wxT(','), wxT('\0'))); + CPPUNIT_ASSERT( exparr2 == realarr2 ); + } +} + +void ArraysTestCase::wxStringArrayJoinTest() +{ + // test wxJoin: + + { + const wxChar *arr[] = { wxT("first"), wxT(""), wxT("second"), wxT("third") }; + wxString expected = wxT("first,,second,third"); + + wxArrayString arrstr(WXSIZEOF(arr), arr); + wxString result = wxJoin(arrstr, wxT(',')); + CPPUNIT_ASSERT( expected == result ); + } + + { + const wxChar *arr[] = { wxT("first, word"), wxT(",,second"), wxT("third,,") }; + wxString expected = wxT("first\\, word,\\,\\,second,third\\,\\,"); + wxString expected2 = wxT("first, word,,,second,third,,"); + + // escaping on: + wxArrayString arrstr(WXSIZEOF(arr), arr); + wxString result = wxJoin(arrstr, wxT(','), wxT('\\')); + CPPUNIT_ASSERT( expected == result ); + + // escaping turned off: + wxString result2 = wxJoin(arrstr, wxT(','), wxT('\0')); + CPPUNIT_ASSERT( expected2 == result2 ); + } + + { + // test is escape characters placed in the original array are just ignored as they should: + const wxChar *arr[] = { wxT("first\\, wo\\rd"), wxT("seco\\nd"), wxT("\\third\\") }; + wxString expected = wxT("first\\\\, wo\\rd,seco\\nd,\\third\\"); + wxString expected2 = wxT("first\\, wo\\rd,seco\\nd,\\third\\"); + + // escaping on: + wxArrayString arrstr(WXSIZEOF(arr), arr); + wxString result = wxJoin(arrstr, wxT(','), wxT('\\')); + CPPUNIT_ASSERT( expected == result ); + + // escaping turned off: + wxString result2 = wxJoin(arrstr, wxT(','), wxT('\0')); + CPPUNIT_ASSERT( expected2 == result2 ); + } +} + +void ArraysTestCase::wxStringArraySplitJoinTest() +{ + wxChar separators[] = { wxT('a'), wxT(','), wxT('_'), wxT(' '), wxT('\\'), + wxT('&'), wxT('{'), wxT('A'), wxT('<'), wxT('>'), + wxT('\''), wxT('\n'), wxT('!'), wxT('-') }; + + // test with a string: split it and then rejoin it: + + wxString str = wxT("This is a long, long test; if wxSplit and wxJoin do work ") + wxT("correctly, then splitting and joining this 'text' _multiple_ ") + wxT("times shouldn't cause any loss of content.\n") + wxT("This is some latex code: ") + wxT("\\func{wxString}{wxJoin}{") + wxT("\\param{const wxArray String\\&}{ arr}, ") + wxT("\\param{const wxChar}{ sep}, ") + wxT("\\param{const wxChar}{ escape = '\\'}}.\n") + wxT("This is some HTML code: ") + wxT("
") + wxT("