g++ compilation fix after latest changes

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

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index f97572dc99e5ed2756568c8aa54d29c6e892b947..5ed8f5eee3b421b9fa68a8e511675aa1759a54ba 100644 (file)
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -170,6 +170,7 @@ private:
         CPPUNIT_TEST( wxArrayCharTest );
         CPPUNIT_TEST( TestSTL );
         CPPUNIT_TEST( Alloc );
         CPPUNIT_TEST( wxArrayCharTest );
         CPPUNIT_TEST( TestSTL );
         CPPUNIT_TEST( Alloc );

+        CPPUNIT_TEST( Clear );

         CPPUNIT_TEST( Swap );
     CPPUNIT_TEST_SUITE_END();
 
         CPPUNIT_TEST( Swap );
     CPPUNIT_TEST_SUITE_END();
 


@@ -183,6 +184,7 @@ private:
     void wxArrayCharTest();
     void TestSTL();
     void Alloc();
     void wxArrayCharTest();
     void TestSTL();
     void Alloc();

+    void Clear();

     void Swap();
 
     DECLARE_NO_COPY_CLASS(ArraysTestCase)
     void Swap();
 
     DECLARE_NO_COPY_CLASS(ArraysTestCase)


@@ -465,7 +467,7 @@ void ArraysTestCase::wxStringArraySplitJoinTest()
 
     CPPUNIT_ASSERT( wxSplit(string, _T(';')).empty() );
 
 
     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()
 }
 
 void ArraysTestCase::wxObjArrayTest()


@@ -474,26 +476,26 @@ void ArraysTestCase::wxObjArrayTest()
         ArrayBars bars;
         Bar bar(_T("first bar in general, second bar in array (two copies!)"));
 
         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(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);
 
 
         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();
 
 
         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)                                                     \
 }
 
 #define TestArrayOf(name)                                                     \


@@ -548,37 +550,73 @@ void ArraysTestCase::Alloc()
     wxArrayInt a;
     a.Add(17);
     a.Add(9);
     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);
 
 
     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] );
 }
 
     CPPUNIT_ASSERT_EQUAL( 17, a[0] );
     CPPUNIT_ASSERT_EQUAL( 9, a[1] );
 }
 

-void ArraysTestCase::Swap()
+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

 {
 {

-    wxArrayString a1, a2;
+
+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.swap(a2);
     CPPUNIT_ASSERT( a1.empty() && a2.empty() );
 

-    a1.push_back("Foo");
+    a1.push_back(v1);

     a1.swap(a2);
     CPPUNIT_ASSERT( a1.empty() );
     CPPUNIT_ASSERT_EQUAL( 1, a2.size() );
 
     a1.swap(a2);
     CPPUNIT_ASSERT( a1.empty() );
     CPPUNIT_ASSERT_EQUAL( 1, a2.size() );
 

-    a1.push_back("Bar");
-    a1.push_back("Baz");
+    a1.push_back(v2);
+    a1.push_back(v3);

     a2.swap(a1);
     CPPUNIT_ASSERT_EQUAL( 1, a1.size() );
     CPPUNIT_ASSERT_EQUAL( 2, a2.size() );
     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() );
 }
 
 
     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);
+
+    // VC6 can't compile this call with mysterious error about in DoTestSwap()
+#ifndef __VISUALC6__
+    DoTestSwap(1, 10, 100, (wxArrayInt *)NULL);
+#endif
+
+    DoTestSwap(6L, 28L, 496L, (wxArrayLong *)NULL);
+}
+

 void ArraysTestCase::TestSTL()
 {
     wxArrayInt list1;
 void ArraysTestCase::TestSTL()
 {
     wxArrayInt list1;


@@ -591,7 +629,7 @@ void ArraysTestCase::TestSTL()
         list1.push_back(i);
 
     CPPUNIT_ASSERT( list1.capacity() >= (size_t)COUNT );
         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 )
 
     for ( it = list1.begin(), en = list1.end(), i = 0;
           it != en; ++it, ++i )