X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93a800a95e67a38284a2980543c4b0b1a792573c..01a65e7c585afb79e7c47a7b99f2e450b9e35542:/tests/arrays/arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index 1cd0537457..0913b8ab8e 100644
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -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()
@@ -609,11 +622,7 @@ void ArraysTestCase::Swap()
 {
     DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL);
 
-    // VC6 can't compile this call with mysterious error about in DoTestSwap()
-#ifndef __VISUALC6__
     DoTestSwap(1, 10, 100, (wxArrayInt *)NULL);
-#endif
-
     DoTestSwap(6, 28, 496, (wxArrayLong *)NULL);
 }