replace CPPUNIT_ASSERTs with CPPUNIT_ASSERT_EQUALs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/lists/lists.cpp b/tests/lists/lists.cpp
index ac9964549042d6b1ad52341c82edcf798bba58e2..f634eb523145cd61d70ea61aa8a1deccc3525a6b 100644 (file)
--- a/tests/lists/lists.cpp
+++ b/tests/lists/lists.cpp
@@ -84,40 +84,31 @@ void ListsTestCase::wxListTest()
 {
     wxListInt list1;
     int dummy[5];
 {
     wxListInt list1;
     int dummy[5];

-    int i;
+    size_t i;

 
 

-    for ( i = 0; i < 5; ++i )
+    for ( i = 0; i < WXSIZEOF(dummy); ++i )

         list1.Append(dummy + i);
 
         list1.Append(dummy + i);
 

-    CPPUNIT_ASSERT( list1.GetCount() == 5 );
-    CPPUNIT_ASSERT( list1.Item(3)->GetData() == dummy + 3 );
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(dummy), list1.GetCount() );
+    CPPUNIT_ASSERT_EQUAL( dummy + 3, list1.Item(3)->GetData() );

     CPPUNIT_ASSERT( list1.Find(dummy + 4) );
 
     CPPUNIT_ASSERT( list1.Find(dummy + 4) );
 

-    wxListInt::compatibility_iterator node = list1.GetFirst();
-    i = 0;
-
-    while (node)
+    wxListInt::compatibility_iterator node;
+    for ( i = 0, node = list1.GetFirst(); node; ++i, node = node->GetNext() )

     {
     {

-        CPPUNIT_ASSERT( node->GetData() == dummy + i );
-        node = node->GetNext();
-        ++i;
+        CPPUNIT_ASSERT_EQUAL( dummy + i, node->GetData() );

     }
 
     }
 

-    CPPUNIT_ASSERT( size_t(i) == list1.GetCount() );
+    CPPUNIT_ASSERT_EQUAL( i, list1.GetCount() );

 
     list1.Insert(dummy + 0);
     list1.Insert(1, dummy + 1);
     list1.Insert(list1.GetFirst()->GetNext()->GetNext(), dummy + 2);
 
 
     list1.Insert(dummy + 0);
     list1.Insert(1, dummy + 1);
     list1.Insert(list1.GetFirst()->GetNext()->GetNext(), dummy + 2);
 

-    node = list1.GetFirst();
-    i = 0;
-
-    while (i < 3)
+    for ( i = 0, node = list1.GetFirst(); i < 3; ++i, node = node->GetNext() )

     {
         int* t = node->GetData();
     {
         int* t = node->GetData();

-        CPPUNIT_ASSERT( t == dummy + i );
-        node = node->GetNext();
-        ++i;
+        CPPUNIT_ASSERT_EQUAL( dummy + i, t );

     }
 }
 
     }
 }