X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10dcbe6369f40ed96a7fad6a0aee6c74a6366759..197ab43d72571ecfd86c35f1832f063237775648:/tests/arrays/arrays.cpp diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp index c27f6a4a2d..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,17 +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) }; @@ -188,7 +218,7 @@ void ArraysTestCase::wxStringArrayTest() wxArrayString a2(a1); - CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , _T("thermit") , + CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , _T("thermit") , _T("condor") , _T("lion") , _T("lion") , @@ -200,7 +230,7 @@ void ArraysTestCase::wxStringArrayTest() wxSortedArrayString a3(a1); - CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , _T("alligator") , + CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , _T("alligator") , _T("condor") , _T("dog") , _T("human") , @@ -214,7 +244,7 @@ void ArraysTestCase::wxStringArrayTest() for (wxArrayString::iterator it = a1.begin(), en = a1.end(); it != en; ++it) a4.Add(*it); - CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , _T("alligator") , + CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , _T("alligator") , _T("condor") , _T("dog") , _T("human") , @@ -268,12 +298,176 @@ void ArraysTestCase::wxStringArrayTest() _T("thermit") , _T("alligator") ) ); CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) ); - CPPUNIT_ASSERT( a1.Index( "dog" ) == 0 ); - CPPUNIT_ASSERT( a1.Index( "human" ) == 1 ); - CPPUNIT_ASSERT( a1.Index( "humann" ) == wxNOT_FOUND ); - CPPUNIT_ASSERT( a1.Index( "condor" ) == 2 ); - CPPUNIT_ASSERT( a1.Index( "thermit" ) == 3 ); - CPPUNIT_ASSERT( a1.Index( "alligator" ) == 4 ); + CPPUNIT_ASSERT( a1.Index( _T("dog") ) == 0 ); + CPPUNIT_ASSERT( a1.Index( _T("human") ) == 1 ); + CPPUNIT_ASSERT( a1.Index( _T("humann") ) == wxNOT_FOUND ); + CPPUNIT_ASSERT( a1.Index( _T("condor") ) == 2 ); + CPPUNIT_ASSERT( a1.Index( _T("thermit") ) == 3 ); + CPPUNIT_ASSERT( a1.Index( _T("alligator") ) == 4 ); + + wxArrayString a5; + + CPPUNIT_ASSERT( a5.Add( _T("x"), 1 ) == 0 ); + CPPUNIT_ASSERT( a5.Add( _T("a"), 3 ) == 1 ); + + CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, _T("x") , + _T("a") , + _T("a") , + _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("Initial page of Mozilla Firefox") + wxT(""); + + size_t i; + for (i = 0; i < WXSIZEOF(separators); i++) + { + wxArrayString arr = wxSplit(str, separators[i]); + CPPUNIT_ASSERT( str == wxJoin(arr, separators[i]) ); + } + + + // test with an array: join it and then resplit it: + + const wxChar *arr[] = + { + wxT("first, second!"), wxT("this is the third!!"), + wxT("\nThat's the fourth token\n\n"), wxT(" - fifth\ndummy\ntoken - "), + wxT("_sixth__token__with_underscores"), wxT("The! Last! One!") + }; + wxArrayString theArr(WXSIZEOF(arr), arr); + + for (i = 0; i < WXSIZEOF(separators); i++) + { + wxString string = wxJoin(theArr, separators[i]); + CPPUNIT_ASSERT( theArr == wxSplit(string, separators[i]) ); + } + + wxArrayString emptyArray; + wxString string = wxJoin(emptyArray, _T(';')); + CPPUNIT_ASSERT( string.empty() ); + + CPPUNIT_ASSERT( wxSplit(string, _T(';')).empty() ); + + CPPUNIT_ASSERT_EQUAL( 2, wxSplit(_T(";"), _T(';')).size() ); } void ArraysTestCase::wxObjArrayTest() @@ -282,26 +476,26 @@ void ArraysTestCase::wxObjArrayTest() ArrayBars bars; Bar bar(_T("first bar in general, second bar in array (two copies!)")); - CPPUNIT_ASSERT( bars.GetCount() == 0 ); - CPPUNIT_ASSERT( Bar::GetNumber() == 1 ); + CPPUNIT_ASSERT_EQUAL( 0, bars.GetCount() ); + CPPUNIT_ASSERT_EQUAL( 1, Bar::GetNumber() ); bars.Add(new Bar(_T("first bar in array"))); - bars.Add(bar,2); + bars.Add(bar, 2); - CPPUNIT_ASSERT( bars.GetCount() == 3 ); - CPPUNIT_ASSERT( Bar::GetNumber() == 4 ); + CPPUNIT_ASSERT_EQUAL( 3, bars.GetCount() ); + CPPUNIT_ASSERT_EQUAL( 4, Bar::GetNumber() ); bars.RemoveAt(1, bars.GetCount() - 1); - CPPUNIT_ASSERT( bars.GetCount() == 1 ); - CPPUNIT_ASSERT( Bar::GetNumber() == 2 ); + CPPUNIT_ASSERT_EQUAL( 1, bars.GetCount() ); + CPPUNIT_ASSERT_EQUAL( 2, Bar::GetNumber() ); bars.Empty(); - CPPUNIT_ASSERT( bars.GetCount() == 0 ); - CPPUNIT_ASSERT( Bar::GetNumber() == 1 ); + CPPUNIT_ASSERT_EQUAL( 0, bars.GetCount() ); + CPPUNIT_ASSERT_EQUAL( 1, Bar::GetNumber() ); } - CPPUNIT_ASSERT( Bar::GetNumber() == 0 ); + CPPUNIT_ASSERT_EQUAL( 0, Bar::GetNumber() ); } #define TestArrayOf(name) \ @@ -345,9 +539,79 @@ void ArraysTestCase::wxArray ## name ## Test() \ CPPUNIT_ASSERT( b.Index( 17 ) == 3 ); \ } -TestArrayOf(UShort); +TestArrayOf(UShort) + +TestArrayOf(Char) + +TestArrayOf(Int) + +void ArraysTestCase::Alloc() +{ + wxArrayInt a; + a.Add(17); + a.Add(9); + CPPUNIT_ASSERT_EQUAL( 2, a.GetCount() ); + + a.Alloc(1000); + + CPPUNIT_ASSERT_EQUAL( 2, a.GetCount() ); + CPPUNIT_ASSERT_EQUAL( 17, a[0] ); + CPPUNIT_ASSERT_EQUAL( 9, a[1] ); +} + +void ArraysTestCase::Clear() +{ + ItemPtrArray items; + + WX_CLEAR_ARRAY(items); + CPPUNIT_ASSERT_EQUAL( 0, items.size() ); -TestArrayOf(Int); + items.push_back(new Item(17)); + items.push_back(new Item(71)); + CPPUNIT_ASSERT_EQUAL( 2, items.size() ); + + WX_CLEAR_ARRAY(items); + CPPUNIT_ASSERT_EQUAL( 0, items.size() ); +} + +namespace +{ + +template +void DoTestSwap(T v1, T v2, T v3, + A * WXUNUSED(dummyUglyVC6Workaround)) +{ + A a1, a2; + a1.swap(a2); + CPPUNIT_ASSERT( a1.empty() && a2.empty() ); + + a1.push_back(v1); + a1.swap(a2); + CPPUNIT_ASSERT( a1.empty() ); + CPPUNIT_ASSERT_EQUAL( 1, a2.size() ); + + a1.push_back(v2); + a1.push_back(v3); + a2.swap(a1); + CPPUNIT_ASSERT_EQUAL( 1, a1.size() ); + CPPUNIT_ASSERT_EQUAL( 2, a2.size() ); + CPPUNIT_ASSERT_EQUAL( v1, a1[0] ); + CPPUNIT_ASSERT_EQUAL( v3, a2[1] ); + + a1.swap(a2); + CPPUNIT_ASSERT_EQUAL( 2, a1.size() ); + CPPUNIT_ASSERT_EQUAL( 1, a2.size() ); +} + +} // anonymous namespace + +void ArraysTestCase::Swap() +{ + DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL); + + DoTestSwap(1, 10, 100, (wxArrayInt *)NULL); + DoTestSwap(6, 28, 496, (wxArrayLong *)NULL); +} void ArraysTestCase::TestSTL() { @@ -355,21 +619,30 @@ void ArraysTestCase::TestSTL() wxArrayInt::iterator it, en; wxArrayInt::reverse_iterator rit, ren; int i; - for ( i = 0; i < 5; ++i ) + static const int COUNT = 5; + + for ( i = 0; i < COUNT; ++i ) list1.push_back(i); + CPPUNIT_ASSERT( list1.capacity() >= (size_t)COUNT ); + CPPUNIT_ASSERT_EQUAL( COUNT, list1.size() ); + for ( it = list1.begin(), en = list1.end(), i = 0; it != en; ++it, ++i ) { CPPUNIT_ASSERT( *it == i ); } - for ( rit = list1.rbegin(), ren = list1.rend(), i = 4; + CPPUNIT_ASSERT_EQUAL( COUNT, i ); + + for ( rit = list1.rbegin(), ren = list1.rend(), i = COUNT; rit != ren; ++rit, --i ) { - CPPUNIT_ASSERT( *rit == i ); + CPPUNIT_ASSERT( *rit == i-1 ); } + CPPUNIT_ASSERT_EQUAL( 0, i ); + CPPUNIT_ASSERT( *list1.rbegin() == *(list1.end()-1) && *list1.begin() == *(list1.rend()-1) ); @@ -378,7 +651,7 @@ void ArraysTestCase::TestSTL() CPPUNIT_ASSERT( *list1.begin() == *(it-1) && *list1.rbegin() == *(rit-1) ); - CPPUNIT_ASSERT( ( list1.front() == 0 ) && ( list1.back() == 4 ) ); + CPPUNIT_ASSERT( ( list1.front() == 0 ) && ( list1.back() == COUNT - 1 ) ); list1.erase(list1.begin()); list1.erase(list1.end()-1); @@ -388,4 +661,10 @@ void ArraysTestCase::TestSTL() { CPPUNIT_ASSERT( *it == i ); } + + + ItemPtrArray items; + items.push_back(new Item(17)); + CPPUNIT_ASSERT_EQUAL( 17, (*(items.rbegin()))->n ); + CPPUNIT_ASSERT_EQUAL( 17, (**items.begin()).n ); }