X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10dcbe6369f40ed96a7fad6a0aee6c74a6366759..69d313011bddec6cefeb4b9925e94a17539005e7:/tests/arrays/arrays.cpp?ds=sidebyside diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp index c27f6a4a2d..049fbf09ae 100644 --- a/tests/arrays/arrays.cpp +++ b/tests/arrays/arrays.cpp @@ -188,7 +188,7 @@ void ArraysTestCase::wxStringArrayTest() wxArrayString a2(a1); - CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , _T("thermit") , + CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , _T("thermit") , _T("condor") , _T("lion") , _T("lion") , @@ -200,7 +200,7 @@ void ArraysTestCase::wxStringArrayTest() wxSortedArrayString a3(a1); - CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , _T("alligator") , + CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , _T("alligator") , _T("condor") , _T("dog") , _T("human") , @@ -214,7 +214,7 @@ void ArraysTestCase::wxStringArrayTest() for (wxArrayString::iterator it = a1.begin(), en = a1.end(); it != en; ++it) a4.Add(*it); - CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , _T("alligator") , + CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , _T("alligator") , _T("condor") , _T("dog") , _T("human") , @@ -268,12 +268,22 @@ void ArraysTestCase::wxStringArrayTest() _T("thermit") , _T("alligator") ) ); 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 ); + CPPUNIT_ASSERT( a1.Index( _T("dog") ) == 0 ); + CPPUNIT_ASSERT( a1.Index( _T("human") ) == 1 ); + CPPUNIT_ASSERT( a1.Index( _T("humann") ) == wxNOT_FOUND ); + CPPUNIT_ASSERT( a1.Index( _T("condor") ) == 2 ); + CPPUNIT_ASSERT( a1.Index( _T("thermit") ) == 3 ); + CPPUNIT_ASSERT( a1.Index( _T("alligator") ) == 4 ); + + wxArrayString a5; + + CPPUNIT_ASSERT( a5.Add( _T("x"), 1 ) == 0 ); + CPPUNIT_ASSERT( a5.Add( _T("a"), 3 ) == 1 ); + + CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, _T("x") , + _T("a") , + _T("a") , + _T("a") ) ); } void ArraysTestCase::wxObjArrayTest()