X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abbb59e8eb995f445759df30ee507c74af690b51..197ab43d72571ecfd86c35f1832f063237775648:/tests/arrays/arrays.cpp?ds=sidebyside diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp index 8d05e0ca8d..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,9 +125,9 @@ int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second) \ typedef unsigned short ushort; -DEFINE_COMPARE(Char, char); -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); @@ -139,6 +139,15 @@ WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShor 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 // ---------------------------------------------------------------------------- @@ -161,6 +170,8 @@ private: CPPUNIT_TEST( wxArrayCharTest ); CPPUNIT_TEST( TestSTL ); CPPUNIT_TEST( Alloc ); + CPPUNIT_TEST( Clear ); + CPPUNIT_TEST( Swap ); CPPUNIT_TEST_SUITE_END(); void wxStringArrayTest(); @@ -173,6 +184,8 @@ private: void wxArrayCharTest(); void TestSTL(); void Alloc(); + void Clear(); + void Swap(); DECLARE_NO_COPY_CLASS(ArraysTestCase) }; @@ -424,7 +437,8 @@ void ArraysTestCase::wxStringArraySplitJoinTest() wxT("Initial page of Mozilla Firefox") wxT(""); - for (size_t i=0; i < WXSIZEOF(separators); i++) + size_t i; + for (i = 0; i < WXSIZEOF(separators); i++) { wxArrayString arr = wxSplit(str, separators[i]); CPPUNIT_ASSERT( str == wxJoin(arr, separators[i]) ); @@ -441,7 +455,7 @@ void ArraysTestCase::wxStringArraySplitJoinTest() }; wxArrayString theArr(WXSIZEOF(arr), arr); - for (size_t i=0; i < WXSIZEOF(separators); i++) + for (i = 0; i < WXSIZEOF(separators); i++) { wxString string = wxJoin(theArr, separators[i]); CPPUNIT_ASSERT( theArr == wxSplit(string, separators[i]) ); @@ -453,7 +467,7 @@ void ArraysTestCase::wxStringArraySplitJoinTest() CPPUNIT_ASSERT( wxSplit(string, _T(';')).empty() ); - CPPUNIT_ASSERT_EQUAL( (size_t)2, wxSplit(_T(";"), _T(';')).size() ); + CPPUNIT_ASSERT_EQUAL( 2, wxSplit(_T(";"), _T(';')).size() ); } void ArraysTestCase::wxObjArrayTest() @@ -462,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) \ @@ -525,26 +539,80 @@ void ArraysTestCase::wxArray ## name ## Test() \ CPPUNIT_ASSERT( b.Index( 17 ) == 3 ); \ } -TestArrayOf(UShort); +TestArrayOf(UShort) -TestArrayOf(Char); +TestArrayOf(Char) -TestArrayOf(Int); +TestArrayOf(Int) void ArraysTestCase::Alloc() { wxArrayInt a; a.Add(17); a.Add(9); - CPPUNIT_ASSERT_EQUAL( size_t(2), a.GetCount() ); + CPPUNIT_ASSERT_EQUAL( 2, a.GetCount() ); a.Alloc(1000); - CPPUNIT_ASSERT_EQUAL( size_t(2), a.GetCount() ); + 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() ); + + 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() { wxArrayInt list1; @@ -557,7 +625,7 @@ void ArraysTestCase::TestSTL() list1.push_back(i); CPPUNIT_ASSERT( list1.capacity() >= (size_t)COUNT ); - CPPUNIT_ASSERT_EQUAL( (size_t)COUNT, list1.size() ); + CPPUNIT_ASSERT_EQUAL( COUNT, list1.size() ); for ( it = list1.begin(), en = list1.end(), i = 0; it != en; ++it, ++i ) @@ -593,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 ); }