only run tests using multiline strings with multiline text control; document that...

[wxWidgets.git] / tests / arrays / arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index 3df8126846b9dfbe2500f73ecde5141d84d8742d..0913b8ab8e299338166d482457a02a1c46a9da06 100644 (file)
--- 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_DECLARE_OBJARRAY(Bar, ArrayBars);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(ArrayBars);
+WX_DEFINE_OBJARRAY(ArrayBars)

 
 // ----------------------------------------------------------------------------
 // helpers for sorting arrays and comparing items
 
 // ----------------------------------------------------------------------------
 // helpers for sorting arrays and comparing items


@@ -125,9 +125,9 @@ int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second)                    \
 
 typedef unsigned short ushort;
 
 
 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);
 
 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") ) );
                                           _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()
 }
 
 void ArraysTestCase::wxStringArraySplitTest()


@@ -539,11 +552,11 @@ void ArraysTestCase::wxArray ## name ## Test()                                \
     CPPUNIT_ASSERT( b.Index( 17 ) == 3 );                                     \
 }
 
     CPPUNIT_ASSERT( b.Index( 17 ) == 3 );                                     \
 }
 

-TestArrayOf(UShort);
+TestArrayOf(UShort)

 
 

-TestArrayOf(Char);
+TestArrayOf(Char)

 
 

-TestArrayOf(Int);
+TestArrayOf(Int)

 
 void ArraysTestCase::Alloc()
 {
 
 void ArraysTestCase::Alloc()
 {


@@ -609,11 +622,7 @@ void ArraysTestCase::Swap()
 {
     DoTestSwap("Foo", "Bar", "Baz", (wxArrayString *)NULL);
 
 {
     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);
     DoTestSwap(1, 10, 100, (wxArrayInt *)NULL);

-#endif
-

     DoTestSwap(6, 28, 496, (wxArrayLong *)NULL);
 }
 
     DoTestSwap(6, 28, 496, (wxArrayLong *)NULL);
 }