ignore a const overloaded method

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

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index c6fa3f3bd40e70e253fb2ecf066a244696a8a32b..a776a2c1db82ce1f22cec37f260a67f9b3cef6fc 100644 (file)
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -125,12 +125,18 @@ 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(UShort, ushort);
 DEFINE_COMPARE(Int, int);
 

+WX_DEFINE_ARRAY_CHAR(char, wxArrayChar);
+WX_DEFINE_SORTED_ARRAY_CHAR(char, wxSortedArrayCharNoCmp);
+WX_DEFINE_SORTED_ARRAY_CMP_CHAR(char, CharCompareValues, wxSortedArrayChar);
+

 WX_DEFINE_ARRAY_SHORT(ushort, wxArrayUShort);
 WX_DEFINE_SORTED_ARRAY_SHORT(ushort, wxSortedArrayUShortNoCmp);
 WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShort);
 WX_DEFINE_ARRAY_SHORT(ushort, wxArrayUShort);
 WX_DEFINE_SORTED_ARRAY_SHORT(ushort, wxSortedArrayUShortNoCmp);
 WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShort);

+

 WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt);
 
 // ----------------------------------------------------------------------------
 WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt);
 
 // ----------------------------------------------------------------------------


@@ -148,6 +154,7 @@ private:
         CPPUNIT_TEST( wxObjArrayTest );
         CPPUNIT_TEST( wxArrayUShortTest );
         CPPUNIT_TEST( wxArrayIntTest );
         CPPUNIT_TEST( wxObjArrayTest );
         CPPUNIT_TEST( wxArrayUShortTest );
         CPPUNIT_TEST( wxArrayIntTest );

+        CPPUNIT_TEST( wxArrayCharTest );

         CPPUNIT_TEST( TestSTL );
         CPPUNIT_TEST( Alloc );
     CPPUNIT_TEST_SUITE_END();
         CPPUNIT_TEST( TestSTL );
         CPPUNIT_TEST( Alloc );
     CPPUNIT_TEST_SUITE_END();


@@ -156,6 +163,7 @@ private:
     void wxObjArrayTest();
     void wxArrayUShortTest();
     void wxArrayIntTest();
     void wxObjArrayTest();
     void wxArrayUShortTest();
     void wxArrayIntTest();

+    void wxArrayCharTest();

     void TestSTL();
     void Alloc();
 
     void TestSTL();
     void Alloc();
 


@@ -359,6 +367,8 @@ void ArraysTestCase::wxArray ## name ## Test()                                \
 
 TestArrayOf(UShort);
 
 
 TestArrayOf(UShort);
 

+TestArrayOf(Char);
+

 TestArrayOf(Int);
 
 void ArraysTestCase::Alloc()
 TestArrayOf(Int);
 
 void ArraysTestCase::Alloc()


@@ -366,11 +376,11 @@ void ArraysTestCase::Alloc()
     wxArrayInt a;
     a.Add(17);
     a.Add(9);
     wxArrayInt a;
     a.Add(17);
     a.Add(9);

-    CPPUNIT_ASSERT_EQUAL( 2u, a.GetCount() );
+    CPPUNIT_ASSERT_EQUAL( size_t(2), a.GetCount() );

 
     a.Alloc(1000);
 
 
     a.Alloc(1000);
 

-    CPPUNIT_ASSERT_EQUAL( 2u, a.GetCount() );
+    CPPUNIT_ASSERT_EQUAL( size_t(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] );
 }