typedef unsigned short ushort;
+DEFINE_COMPARE(Char, char);
DEFINE_COMPARE(UShort, ushort);
DEFINE_COMPARE(Int, int);
+WX_DEFINE_ARRAY_CHAR(char, wxArrayChar);
+WX_DEFINE_SORTED_ARRAY_CHAR(char, wxSortedArrayCharNoCmp);
+WX_DEFINE_SORTED_ARRAY_CMP_CHAR(char, CharCompareValues, wxSortedArrayChar);
+
WX_DEFINE_ARRAY_SHORT(ushort, wxArrayUShort);
WX_DEFINE_SORTED_ARRAY_SHORT(ushort, wxSortedArrayUShortNoCmp);
WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShort);
+
WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt);
// ----------------------------------------------------------------------------
private:
CPPUNIT_TEST_SUITE( ArraysTestCase );
CPPUNIT_TEST( wxStringArrayTest );
+ CPPUNIT_TEST( wxStringArraySplitTest );
+ CPPUNIT_TEST( wxStringArrayJoinTest );
+ CPPUNIT_TEST( wxStringArraySplitJoinTest );
+
CPPUNIT_TEST( wxObjArrayTest );
CPPUNIT_TEST( wxArrayUShortTest );
CPPUNIT_TEST( wxArrayIntTest );
+ CPPUNIT_TEST( wxArrayCharTest );
CPPUNIT_TEST( TestSTL );
+ CPPUNIT_TEST( Alloc );
CPPUNIT_TEST_SUITE_END();
void wxStringArrayTest();
+ void wxStringArraySplitTest();
+ void wxStringArrayJoinTest();
+ void wxStringArraySplitJoinTest();
void wxObjArrayTest();
void wxArrayUShortTest();
void wxArrayIntTest();
+ void wxArrayCharTest();
void TestSTL();
+ void Alloc();
DECLARE_NO_COPY_CLASS(ArraysTestCase)
};
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") ,
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") ,
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") ,
_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::wxStringArraySplitTest()
+{
+ // test wxSplit:
+
+ {
+ wxString str = wxT(",,,,first,second,third,,");
+ const wxChar *expected[] =
+ { wxT(""), wxT(""), wxT(""), wxT(""), wxT("first"),
+ wxT("second"), wxT("third"), wxT(""), wxT("") };
+
+ wxArrayString exparr(WXSIZEOF(expected), expected);
+ wxArrayString realarr(wxSplit(str, wxT(',')));
+ CPPUNIT_ASSERT( exparr == realarr );
+ }
+
+ {
+ wxString str = wxT(",\\,first,second,third,");
+ const wxChar *expected[] =
+ { wxT(""), wxT(",first"), wxT("second"), wxT("third"), wxT("") };
+ const wxChar *expected2[] =
+ { wxT(""), wxT("\\"), wxT("first"), wxT("second"), wxT("third"), wxT("") };
+
+ // escaping on:
+ wxArrayString exparr(WXSIZEOF(expected), expected);
+ wxArrayString realarr(wxSplit(str, wxT(','), wxT('\\')));
+ CPPUNIT_ASSERT( exparr == realarr );
+
+ // escaping turned off:
+ wxArrayString exparr2(WXSIZEOF(expected2), expected2);
+ wxArrayString realarr2(wxSplit(str, wxT(','), wxT('\0')));
+ CPPUNIT_ASSERT( exparr2 == realarr2 );
+ }
+
+ {
+ // test is escape characters placed before non-separator character are
+ // just ignored as they should:
+ wxString str = wxT(",\\,,fir\\st,se\\cond\\,,\\third");
+ const wxChar *expected[] =
+ { wxT(""), wxT(","), wxT("fir\\st"), wxT("se\\cond,"), wxT("\\third") };
+ const wxChar *expected2[] =
+ { wxT(""), wxT("\\"), wxT(""), wxT("fir\\st"), wxT("se\\cond\\"),
+ wxT(""), wxT("\\third") };
+
+ // escaping on:
+ wxArrayString exparr(WXSIZEOF(expected), expected);
+ wxArrayString realarr(wxSplit(str, wxT(','), wxT('\\')));
+ CPPUNIT_ASSERT( exparr == realarr );
+
+ // escaping turned off:
+ wxArrayString exparr2(WXSIZEOF(expected2), expected2);
+ wxArrayString realarr2(wxSplit(str, wxT(','), wxT('\0')));
+ CPPUNIT_ASSERT( exparr2 == realarr2 );
+ }
+}
+
+void ArraysTestCase::wxStringArrayJoinTest()
+{
+ // test wxJoin:
+
+ {
+ const wxChar *arr[] = { wxT("first"), wxT(""), wxT("second"), wxT("third") };
+ wxString expected = wxT("first,,second,third");
+
+ wxArrayString arrstr(WXSIZEOF(arr), arr);
+ wxString result = wxJoin(arrstr, wxT(','));
+ CPPUNIT_ASSERT( expected == result );
+ }
+
+ {
+ const wxChar *arr[] = { wxT("first, word"), wxT(",,second"), wxT("third,,") };
+ wxString expected = wxT("first\\, word,\\,\\,second,third\\,\\,");
+ wxString expected2 = wxT("first, word,,,second,third,,");
+
+ // escaping on:
+ wxArrayString arrstr(WXSIZEOF(arr), arr);
+ wxString result = wxJoin(arrstr, wxT(','), wxT('\\'));
+ CPPUNIT_ASSERT( expected == result );
+
+ // escaping turned off:
+ wxString result2 = wxJoin(arrstr, wxT(','), wxT('\0'));
+ CPPUNIT_ASSERT( expected2 == result2 );
+ }
+
+ {
+ // test is escape characters placed in the original array are just ignored as they should:
+ const wxChar *arr[] = { wxT("first\\, wo\\rd"), wxT("seco\\nd"), wxT("\\third\\") };
+ wxString expected = wxT("first\\\\, wo\\rd,seco\\nd,\\third\\");
+ wxString expected2 = wxT("first\\, wo\\rd,seco\\nd,\\third\\");
+
+ // escaping on:
+ wxArrayString arrstr(WXSIZEOF(arr), arr);
+ wxString result = wxJoin(arrstr, wxT(','), wxT('\\'));
+ CPPUNIT_ASSERT( expected == result );
+
+ // escaping turned off:
+ wxString result2 = wxJoin(arrstr, wxT(','), wxT('\0'));
+ CPPUNIT_ASSERT( expected2 == result2 );
+ }
+}
+
+void ArraysTestCase::wxStringArraySplitJoinTest()
+{
+ wxChar separators[] = { wxT('a'), wxT(','), wxT('_'), wxT(' '), wxT('\\'),
+ wxT('&'), wxT('{'), wxT('A'), wxT('<'), wxT('>'),
+ wxT('\''), wxT('\n'), wxT('!'), wxT('-') };
+
+ // test with a string: split it and then rejoin it:
+
+ wxString str = wxT("This is a long, long test; if wxSplit and wxJoin do work ")
+ wxT("correctly, then splitting and joining this 'text' _multiple_ ")
+ wxT("times shouldn't cause any loss of content.\n")
+ wxT("This is some latex code: ")
+ wxT("\\func{wxString}{wxJoin}{")
+ wxT("\\param{const wxArray String\\&}{ arr}, ")
+ wxT("\\param{const wxChar}{ sep}, ")
+ wxT("\\param{const wxChar}{ escape = '\\'}}.\n")
+ wxT("This is some HTML code: ")
+ wxT("<html><head><meta http-equiv=\"content-type\">")
+ wxT("<title>Initial page of Mozilla Firefox</title>")
+ wxT("</meta></head></html>");
+
+ for (size_t i=0; i < WXSIZEOF(separators); i++)
+ {
+ wxArrayString arr = wxSplit(str, separators[i]);
+ CPPUNIT_ASSERT( str == wxJoin(arr, separators[i]) );
+ }
+
+
+ // test with an array: join it and then resplit it:
+
+ const wxChar *arr[] =
+ {
+ wxT("first, second!"), wxT("this is the third!!"),
+ wxT("\nThat's the fourth token\n\n"), wxT(" - fifth\ndummy\ntoken - "),
+ wxT("_sixth__token__with_underscores"), wxT("The! Last! One!")
+ };
+ wxArrayString theArr(WXSIZEOF(arr), arr);
+
+ for (size_t i=0; i < WXSIZEOF(separators); i++)
+ {
+ wxString string = wxJoin(theArr, separators[i]);
+ CPPUNIT_ASSERT( theArr == wxSplit(string, separators[i]) );
+ }
+
+ wxArrayString emptyArray;
+ wxString string = wxJoin(emptyArray, _T(';'));
+ CPPUNIT_ASSERT( string.empty() );
+
+ CPPUNIT_ASSERT( wxSplit(string, _T(';')).empty() );
+
+ CPPUNIT_ASSERT_EQUAL( (size_t)2, wxSplit(_T(";"), _T(';')).size() );
}
void ArraysTestCase::wxObjArrayTest()
TestArrayOf(UShort);
+TestArrayOf(Char);
+
TestArrayOf(Int);
+void ArraysTestCase::Alloc()
+{
+ wxArrayInt a;
+ a.Add(17);
+ a.Add(9);
+ CPPUNIT_ASSERT_EQUAL( size_t(2), a.GetCount() );
+
+ a.Alloc(1000);
+
+ CPPUNIT_ASSERT_EQUAL( size_t(2), a.GetCount() );
+ CPPUNIT_ASSERT_EQUAL( 17, a[0] );
+ CPPUNIT_ASSERT_EQUAL( 9, a[1] );
+}
+
void ArraysTestCase::TestSTL()
{
wxArrayInt list1;
wxArrayInt::iterator it, en;
wxArrayInt::reverse_iterator rit, ren;
int i;
- for ( i = 0; i < 5; ++i )
+ static const int COUNT = 5;
+
+ for ( i = 0; i < COUNT; ++i )
list1.push_back(i);
+ CPPUNIT_ASSERT( list1.capacity() >= (size_t)COUNT );
+ CPPUNIT_ASSERT_EQUAL( (size_t)COUNT, list1.size() );
+
for ( it = list1.begin(), en = list1.end(), i = 0;
it != en; ++it, ++i )
{
CPPUNIT_ASSERT( *it == i );
}
- for ( rit = list1.rbegin(), ren = list1.rend(), i = 4;
+ CPPUNIT_ASSERT_EQUAL( COUNT, i );
+
+ for ( rit = list1.rbegin(), ren = list1.rend(), i = COUNT;
rit != ren; ++rit, --i )
{
- CPPUNIT_ASSERT( *rit == i );
+ CPPUNIT_ASSERT( *rit == i-1 );
}
+ CPPUNIT_ASSERT_EQUAL( 0, i );
+
CPPUNIT_ASSERT( *list1.rbegin() == *(list1.end()-1) &&
*list1.begin() == *(list1.rend()-1) );
CPPUNIT_ASSERT( *list1.begin() == *(it-1) &&
*list1.rbegin() == *(rit-1) );
- CPPUNIT_ASSERT( ( list1.front() == 0 ) && ( list1.back() == 4 ) );
+ CPPUNIT_ASSERT( ( list1.front() == 0 ) && ( list1.back() == COUNT - 1 ) );
list1.erase(list1.begin());
list1.erase(list1.end()-1);
projects / wxWidgets.git / blobdiff