X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10dcbe6369f40ed96a7fad6a0aee6c74a6366759..76cf603e9100d61bb4d184946071cf164092ce40:/tests/arrays/arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index c27f6a4a2d..e7c97b3f75 100644
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -149,6 +149,7 @@ private:
         CPPUNIT_TEST( wxArrayUShortTest );
         CPPUNIT_TEST( wxArrayIntTest );
         CPPUNIT_TEST( TestSTL );
+        CPPUNIT_TEST( Alloc );
     CPPUNIT_TEST_SUITE_END();
 
     void wxStringArrayTest();
@@ -156,6 +157,7 @@ private:
     void wxArrayUShortTest();
     void wxArrayIntTest();
     void TestSTL();
+    void Alloc();
 
     DECLARE_NO_COPY_CLASS(ArraysTestCase)
 };
@@ -188,7 +190,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 +202,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 +216,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 +270,22 @@ 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::wxObjArrayTest()
@@ -349,27 +361,50 @@ TestArrayOf(UShort);
 
 TestArrayOf(Int);
 
+void ArraysTestCase::Alloc()
+{
+    wxArrayInt a;
+    a.Add(17);
+    a.Add(9);
+    CPPUNIT_ASSERT_EQUAL( size_t(2), a.GetCount() );
+
+    a.Alloc(1000);
+
+    CPPUNIT_ASSERT_EQUAL( size_t(2), a.GetCount() );
+    CPPUNIT_ASSERT_EQUAL( 17, a[0] );
+    CPPUNIT_ASSERT_EQUAL( 9, a[1] );
+}
+
 void ArraysTestCase::TestSTL()
 {
     wxArrayInt list1;
     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( (size_t)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 +413,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);