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

Fix wxSortedArray::Index() when wxUSE_STL == 1, with tests.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-01-22 13:28:49 +00:00
parent 104fa1124d
commit 10dcbe6369
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/dynarray.cpp
View File

@@ -99,8 +99,8 @@ int name::Index(T lItem, CMPFUNC fnCompare) const \
{ \ { \
Predicate p((SCMPFUNC)fnCompare); \ Predicate p((SCMPFUNC)fnCompare); \
const_iterator it = std::lower_bound(begin(), end(), lItem, p); \ const_iterator it = std::lower_bound(begin(), end(), lItem, p); \
return (it != end() && \ return (it != end() && !p(lItem, *it)) ? \
p(lItem, *it)) ? (int)(it - begin()) : wxNOT_FOUND; \ (int)(it - begin()) : wxNOT_FOUND; \
} \ } \
\ \
void name::Shrink() \ void name::Shrink() \

13
tests/arrays/arrays.cpp
View File

@@ -268,6 +268,12 @@ void ArraysTestCase::wxStringArrayTest()
_T("thermit") , _T("thermit") ,
_T("alligator") ) ); _T("alligator") ) );
CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) ); CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
CPPUNIT_ASSERT( a1.Index( "dog" ) == 0 );
CPPUNIT_ASSERT( a1.Index( "human" ) == 1 );
CPPUNIT_ASSERT( a1.Index( "humann" ) == wxNOT_FOUND );
CPPUNIT_ASSERT( a1.Index( "condor" ) == 2 );
CPPUNIT_ASSERT( a1.Index( "thermit" ) == 3 );
CPPUNIT_ASSERT( a1.Index( "alligator" ) == 4 );
} }
void ArraysTestCase::wxObjArrayTest() void ArraysTestCase::wxObjArrayTest()
@@ -330,6 +336,13 @@ void ArraysTestCase::wxArray ## name ## Test() \
\ \
CPPUNIT_ASSERT( COMPARE_4_VALUES(b,1,3,5,17) ); \ CPPUNIT_ASSERT( COMPARE_4_VALUES(b,1,3,5,17) ); \
CPPUNIT_ASSERT( COMPARE_COUNT( b , 4 ) ); \ CPPUNIT_ASSERT( COMPARE_COUNT( b , 4 ) ); \
CPPUNIT_ASSERT( b.Index( 0 ) == wxNOT_FOUND ); \
CPPUNIT_ASSERT( b.Index( 1 ) == 0 ); \
CPPUNIT_ASSERT( b.Index( 3 ) == 1 ); \
CPPUNIT_ASSERT( b.Index( 4 ) == wxNOT_FOUND ); \
CPPUNIT_ASSERT( b.Index( 5 ) == 2 ); \
CPPUNIT_ASSERT( b.Index( 6 ) == wxNOT_FOUND ); \
CPPUNIT_ASSERT( b.Index( 17 ) == 3 ); \
} }
TestArrayOf(UShort); TestArrayOf(UShort);