Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace CPPUNIT_ASSERTs with CPPUNIT_ASSERT_EQUALs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-17 09:47:39 +00:00
parent cece89a494
commit 6124b13407
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/lists/lists.cpp
View File

@@ -84,40 +84,31 @@ void ListsTestCase::wxListTest()
{ {
wxListInt list1; wxListInt list1;
int dummy[5]; 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_EQUAL( WXSIZEOF(dummy), list1.GetCount() );
CPPUNIT_ASSERT( list1.Item(3)->GetData() == dummy + 3 ); 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(); wxListInt::compatibility_iterator node;
i = 0; for ( i = 0, node = list1.GetFirst(); node; ++i, node = node->GetNext() )
while (node)
{ {
CPPUNIT_ASSERT( node->GetData() == dummy + i ); CPPUNIT_ASSERT_EQUAL( dummy + i, node->GetData() );
node = node->GetNext();
++i;
} }
CPPUNIT_ASSERT( size_t(i) == list1.GetCount() ); CPPUNIT_ASSERT_EQUAL( i, list1.GetCount() );
list1.Insert(dummy + 0); list1.Insert(dummy + 0);
list1.Insert(1, dummy + 1); list1.Insert(1, dummy + 1);
list1.Insert(list1.GetFirst()->GetNext()->GetNext(), dummy + 2); list1.Insert(list1.GetFirst()->GetNext()->GetNext(), dummy + 2);
node = list1.GetFirst(); for ( i = 0, node = list1.GetFirst(); i < 3; ++i, node = node->GetNext() )
i = 0;
while (i < 3)
{ {
int* t = node->GetData(); int* t = node->GetData();
CPPUNIT_ASSERT( t == dummy + i ); CPPUNIT_ASSERT_EQUAL( dummy + i, t );
node = node->GetNext();
++i;
} }
} }