X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35d5da677d3203d7027eb28b1b6878be9d920108..d911dc04aea492deb04d00794dc4f59d380ab877:/tests/arrays/arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index 42cacef17c..0913b8ab8e 100644
--- 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_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);
@@ -170,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();
@@ -182,6 +184,8 @@ private:
     void wxArrayCharTest();
     void TestSTL();
     void Alloc();
+    void Clear();
+    void Swap();
 
     DECLARE_NO_COPY_CLASS(ArraysTestCase)
 };
@@ -310,6 +314,19 @@ void ArraysTestCase::wxStringArrayTest()
                                           _T("a") ,
                                           _T("a") ,
                                           _T("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
 }
 
 void ArraysTestCase::wxStringArraySplitTest()
@@ -463,7 +480,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()
@@ -472,26 +489,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)                                                     \
@@ -535,26 +552,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 <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;
@@ -567,7 +638,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 )