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

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index 0681d2c7cc..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);
@@ -314,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()
@@ -467,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()
@@ -539,22 +552,22 @@ 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] );
 }
@@ -608,6 +621,7 @@ void DoTestSwap(T v1, T v2, T v3,
 void ArraysTestCase::Swap()
 {
     DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL);
+
     DoTestSwap(1, 10, 100, (wxArrayInt *)NULL);
     DoTestSwap(6, 28, 496, (wxArrayLong *)NULL);
 }
@@ -624,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 )