X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/555d0d7ef10ece4862658d47f076fb8631b1c7b6..833cce0628dcad21147e75de1afa8afe4a5c86a2:/tests/arrays/arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index 049fbf09ae..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)
 };
@@ -359,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) );
 
@@ -388,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);