implementing delayed freezing, fixes #12865

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

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index 819b1b7a69694fb8ecba6364172f4d36a18cbc12..ac48e92678ca588366f8828464e76f07f3e3b8f3 100644 (file)
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -94,7 +94,7 @@ size_t Bar::ms_bars = 0;
 
 WX_DECLARE_OBJARRAY(Bar, ArrayBars);
 #include "wx/arrimpl.cpp"
 
 WX_DECLARE_OBJARRAY(Bar, ArrayBars);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(ArrayBars);
+WX_DEFINE_OBJARRAY(ArrayBars)

 
 // ----------------------------------------------------------------------------
 // helpers for sorting arrays and comparing items
 
 // ----------------------------------------------------------------------------
 // helpers for sorting arrays and comparing items


@@ -125,9 +125,9 @@ int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second)                    \
 
 typedef unsigned short ushort;
 
 
 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);
 
 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);
 
 
 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------


@@ -151,6 +160,7 @@ public:
 private:
     CPPUNIT_TEST_SUITE( ArraysTestCase );
         CPPUNIT_TEST( wxStringArrayTest );
 private:
     CPPUNIT_TEST_SUITE( ArraysTestCase );
         CPPUNIT_TEST( wxStringArrayTest );

+        CPPUNIT_TEST( SortedArray );

         CPPUNIT_TEST( wxStringArraySplitTest );
         CPPUNIT_TEST( wxStringArrayJoinTest );
         CPPUNIT_TEST( wxStringArraySplitJoinTest );
         CPPUNIT_TEST( wxStringArraySplitTest );
         CPPUNIT_TEST( wxStringArrayJoinTest );
         CPPUNIT_TEST( wxStringArraySplitJoinTest );


@@ -161,9 +171,13 @@ private:
         CPPUNIT_TEST( wxArrayCharTest );
         CPPUNIT_TEST( TestSTL );
         CPPUNIT_TEST( Alloc );
         CPPUNIT_TEST( wxArrayCharTest );
         CPPUNIT_TEST( TestSTL );
         CPPUNIT_TEST( Alloc );

+        CPPUNIT_TEST( Clear );
+        CPPUNIT_TEST( Swap );
+        CPPUNIT_TEST( IndexFromEnd );

     CPPUNIT_TEST_SUITE_END();
 
     void wxStringArrayTest();
     CPPUNIT_TEST_SUITE_END();
 
     void wxStringArrayTest();

+    void SortedArray();

     void wxStringArraySplitTest();
     void wxStringArrayJoinTest();
     void wxStringArraySplitJoinTest();
     void wxStringArraySplitTest();
     void wxStringArrayJoinTest();
     void wxStringArraySplitJoinTest();


@@ -173,6 +187,9 @@ private:
     void wxArrayCharTest();
     void TestSTL();
     void Alloc();
     void wxArrayCharTest();
     void TestSTL();
     void Alloc();

+    void Clear();
+    void Swap();
+    void IndexFromEnd();

 
     DECLARE_NO_COPY_CLASS(ArraysTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(ArraysTestCase)
 };


@@ -180,127 +197,170 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( ArraysTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( ArraysTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ArraysTestCase, "ArraysTestCase" );
 
 void ArraysTestCase::wxStringArrayTest()
 {
     wxArrayString a1;
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ArraysTestCase, "ArraysTestCase" );
 
 void ArraysTestCase::wxStringArrayTest()
 {
     wxArrayString a1;

-    a1.Add(_T("thermit"));
-    a1.Add(_T("condor"));
-    a1.Add(_T("lion"), 3);
-    a1.Add(_T("dog"));
-    a1.Add(_T("human"));
-    a1.Add(_T("alligator"));
-
-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a1 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    a1.Add(wxT("thermit"));
+    a1.Add(wxT("condor"));
+    a1.Add(wxT("lion"), 3);
+    a1.Add(wxT("dog"));
+    a1.Add(wxT("human"));
+    a1.Add(wxT("alligator"));
+
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a1 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 8 ) );
 
     wxArrayString a2(a1);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 8 ) );
 
     wxArrayString a2(a1);
 

-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 8 ) );
 
     wxSortedArrayString a3(a1);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 8 ) );
 
     wxSortedArrayString a3(a1);
 

-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , _T("alligator") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("thermit") ) );
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , wxT("alligator") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("thermit") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a3 , 8 ) );
 
     wxSortedArrayString a4;
     for (wxArrayString::iterator it = a1.begin(), en = a1.end(); it != en; ++it)
         a4.Add(*it);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a3 , 8 ) );
 
     wxSortedArrayString a4;
     for (wxArrayString::iterator it = a1.begin(), en = a1.end(); it != en; ++it)
         a4.Add(*it);
 

-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , _T("alligator") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("thermit") ) );
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , wxT("alligator") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("thermit") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a4 , 8 ) );
 
     a1.RemoveAt(2,3);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a4 , 8 ) );
 
     a1.RemoveAt(2,3);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a2 = a1;
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a2 = a1;
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a2 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a2 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 5 ) );
 
     a1.Sort(false);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 5 ) );
 
     a1.Sort(false);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("alligator") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("thermit") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("alligator") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("thermit") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(true);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(true);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("thermit") ,
-                                           _T("human") ,
-                                           _T("dog") ,
-                                           _T("condor") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("thermit") ,
+                                           wxT("human") ,
+                                           wxT("dog") ,
+                                           wxT("condor") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(&StringLenCompare);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(&StringLenCompare);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("dog") ,
-                                           _T("human") ,
-                                           _T("condor") ,
-                                           _T("thermit") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("condor") ,
+                                           wxT("thermit") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );

-    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 );
+    CPPUNIT_ASSERT( a1.Index( wxT("dog") ) == 0 );
+    CPPUNIT_ASSERT( a1.Index( wxT("human") ) == 1 );
+    CPPUNIT_ASSERT( a1.Index( wxT("humann") ) == wxNOT_FOUND );
+    CPPUNIT_ASSERT( a1.Index( wxT("condor") ) == 2 );
+    CPPUNIT_ASSERT( a1.Index( wxT("thermit") ) == 3 );
+    CPPUNIT_ASSERT( a1.Index( wxT("alligator") ) == 4 );
+
+    CPPUNIT_ASSERT( a1.Index( wxT("dog"), /*bCase=*/true, /*fromEnd=*/true ) == 0 );
+    CPPUNIT_ASSERT( a1.Index( wxT("human"), /*bCase=*/true, /*fromEnd=*/true ) == 1 );
+    CPPUNIT_ASSERT( a1.Index( wxT("humann"), /*bCase=*/true, /*fromEnd=*/true ) == wxNOT_FOUND );
+    CPPUNIT_ASSERT( a1.Index( wxT("condor"), /*bCase=*/true, /*fromEnd=*/true ) == 2 );
+    CPPUNIT_ASSERT( a1.Index( wxT("thermit"), /*bCase=*/true, /*fromEnd=*/true ) == 3 );
+    CPPUNIT_ASSERT( a1.Index( wxT("alligator"), /*bCase=*/true, /*fromEnd=*/true ) == 4 );

 
     wxArrayString a5;
 
 
     wxArrayString a5;
 

-    CPPUNIT_ASSERT( a5.Add( _T("x"), 1 ) == 0 );
-    CPPUNIT_ASSERT( a5.Add( _T("a"), 3 ) == 1 );
+    CPPUNIT_ASSERT( a5.Add( wxT("x"), 1 ) == 0 );
+    CPPUNIT_ASSERT( a5.Add( wxT("a"), 3 ) == 1 );
+
+    CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, wxT("x") ,
+                                          wxT("a") ,
+                                          wxT("a") ,
+                                          wxT("a") ) );
+
+    a5.assign(a1.end(), a1.end());
+    CPPUNIT_ASSERT( a5.empty() );
+
+    a5.assign(a1.begin(), a1.end());
+    CPPUNIT_ASSERT( a5 == a1 );
+
+#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
+    const wxString months[] = { "Jan", "Feb", "Mar" };
+    a5.assign(months, months + WXSIZEOF(months));
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(months), a5.size() );
+    CPPUNIT_ASSERT( COMPARE_3_VALUES(a5, "Jan", "Feb", "Mar") );
+#endif // wxHAS_VECTOR_TEMPLATE_ASSIGN

 
 

-    CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, _T("x") ,
-                                          _T("a") ,
-                                          _T("a") ,
-                                          _T("a") ) );
+    a5.clear();
+    CPPUNIT_ASSERT_EQUAL( 0, a5.size() );
+
+    a5.resize(7, "Foo");
+    CPPUNIT_ASSERT_EQUAL( 7, a5.size() );
+    CPPUNIT_ASSERT_EQUAL( "Foo", a5[3] );
+
+    a5.resize(3);
+    CPPUNIT_ASSERT_EQUAL( 3, a5.size() );
+    CPPUNIT_ASSERT_EQUAL( "Foo", a5[2] );
+}
+
+void ArraysTestCase::SortedArray()
+{
+    wxSortedArrayString a;
+    a.Add("d");
+    a.Add("c");
+    CPPUNIT_ASSERT_EQUAL( 0, a.Index("c") );
+
+    a.push_back("b");
+    a.push_back("a");
+    CPPUNIT_ASSERT_EQUAL( 0, a.Index("a") );

 }
 
 void ArraysTestCase::wxStringArraySplitTest()
 }
 
 void ArraysTestCase::wxStringArraySplitTest()


@@ -449,40 +509,40 @@ void ArraysTestCase::wxStringArraySplitJoinTest()
     }
 
     wxArrayString emptyArray;
     }
 
     wxArrayString emptyArray;

-    wxString string = wxJoin(emptyArray, _T(';'));
+    wxString string = wxJoin(emptyArray, wxT(';'));

     CPPUNIT_ASSERT( string.empty() );
 
     CPPUNIT_ASSERT( string.empty() );
 

-    CPPUNIT_ASSERT( wxSplit(string, _T(';')).empty() );
+    CPPUNIT_ASSERT( wxSplit(string, wxT(';')).empty() );

 
 

-    CPPUNIT_ASSERT_EQUAL( (size_t)2, wxSplit(_T(";"), _T(';')).size() );
+    CPPUNIT_ASSERT_EQUAL( 2, wxSplit(wxT(";"), wxT(';')).size() );

 }
 
 void ArraysTestCase::wxObjArrayTest()
 {
     {
         ArrayBars bars;
 }
 
 void ArraysTestCase::wxObjArrayTest()
 {
     {
         ArrayBars bars;

-        Bar bar(_T("first bar in general, second bar in array (two copies!)"));
+        Bar bar(wxT("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(new Bar(wxT("first bar in array")));
+        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);
 
 
         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();
 
 
         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)                                                     \
 }
 
 #define TestArrayOf(name)                                                     \


@@ -526,26 +586,80 @@ void ArraysTestCase::wxArray ## name ## Test()                                \
     CPPUNIT_ASSERT( b.Index( 17 ) == 3 );                                     \
 }
 
     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);
 
 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);
 
 
     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] );
 }
 
     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 <typename A, typename T>
+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;
 void ArraysTestCase::TestSTL()
 {
     wxArrayInt list1;


@@ -558,7 +672,7 @@ void ArraysTestCase::TestSTL()
         list1.push_back(i);
 
     CPPUNIT_ASSERT( list1.capacity() >= (size_t)COUNT );
         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 )
 
     for ( it = list1.begin(), en = list1.end(), i = 0;
           it != en; ++it, ++i )


@@ -594,4 +708,25 @@ void ArraysTestCase::TestSTL()
     {
         CPPUNIT_ASSERT( *it == i );
     }
     {
         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 );
+}
+
+void ArraysTestCase::IndexFromEnd()
+{
+    wxArrayInt a;
+    a.push_back(10);
+    a.push_back(1);
+    a.push_back(42);
+
+    CPPUNIT_ASSERT_EQUAL( 0, a.Index(10) );
+    CPPUNIT_ASSERT_EQUAL( 1, a.Index(1) );
+    CPPUNIT_ASSERT_EQUAL( 2, a.Index(42) );
+    CPPUNIT_ASSERT_EQUAL( 0, a.Index(10, /*bFromEnd=*/true) );
+    CPPUNIT_ASSERT_EQUAL( 1, a.Index(1, /*bFromEnd=*/true) );
+    CPPUNIT_ASSERT_EQUAL( 2, a.Index(42, /*bFromEnd=*/true) );

 }
 }