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

allow using CPPUNIT_ASSERT_EQUAL(int,unsigned) even on 64 bit platforms (see r59576)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-17 22:02:56 +00:00
parent 167905b222
commit 306f34a368
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/cppunit.h
View File

@@ -152,7 +152,8 @@ CPPUNIT_NS_END
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long)
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(size_t) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
// Use this macro to compare a wxArrayString with the pipe-separated elements // Use this macro to compare a wxArrayString with the pipe-separated elements
// of the given string // of the given string

10
tests/controls/headerctrltest.cpp
View File

@@ -78,19 +78,19 @@ void HeaderCtrlTestCase::tearDown()
void HeaderCtrlTestCase::AddDelete() void HeaderCtrlTestCase::AddDelete()
{ {
CPPUNIT_ASSERT_EQUAL( 0, (size_t)m_header->GetColumnCount() ); CPPUNIT_ASSERT_EQUAL( 0, m_header->GetColumnCount() );
m_header->AppendColumn(wxHeaderColumnSimple("Column 1")); m_header->AppendColumn(wxHeaderColumnSimple("Column 1"));
CPPUNIT_ASSERT_EQUAL( 1, (size_t)m_header->GetColumnCount() ); CPPUNIT_ASSERT_EQUAL( 1, m_header->GetColumnCount() );
m_header->AppendColumn(wxHeaderColumnSimple("Column 2")); m_header->AppendColumn(wxHeaderColumnSimple("Column 2"));
CPPUNIT_ASSERT_EQUAL( 2, (size_t)m_header->GetColumnCount() ); CPPUNIT_ASSERT_EQUAL( 2, m_header->GetColumnCount() );
m_header->InsertColumn(wxHeaderColumnSimple("Column 0"), 0); m_header->InsertColumn(wxHeaderColumnSimple("Column 0"), 0);
CPPUNIT_ASSERT_EQUAL( 3, (size_t)m_header->GetColumnCount() ); CPPUNIT_ASSERT_EQUAL( 3, m_header->GetColumnCount() );
m_header->DeleteColumn(2); m_header->DeleteColumn(2);
CPPUNIT_ASSERT_EQUAL( 2, (size_t)m_header->GetColumnCount() ); CPPUNIT_ASSERT_EQUAL( 2, m_header->GetColumnCount() );
} }
void HeaderCtrlTestCase::BestSize() void HeaderCtrlTestCase::BestSize()