From 24611170023b2f7a8252f590e78061716b3821ef Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 23 Dec 2005 23:27:25 +0000 Subject: [PATCH] more test cases git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/strings/tokenizer.cpp | 48 +++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/tests/strings/tokenizer.cpp b/tests/strings/tokenizer.cpp index 14fd24f8fd..6205988e6a 100644 --- a/tests/strings/tokenizer.cpp +++ b/tests/strings/tokenizer.cpp @@ -72,38 +72,40 @@ static const struct TokenizerTestData } gs_testData[] = { - { _T(""), _T(" "), wxTOKEN_DEFAULT , 0 }, - - { _T("Hello, world"), _T(" "), wxTOKEN_DEFAULT , 2 }, - { _T("Hello, world "), _T(" "), wxTOKEN_DEFAULT , 2 }, - { _T("Hello, world"), _T(","), wxTOKEN_DEFAULT , 2 }, - { _T("Hello, world!"), _T(",!"), wxTOKEN_DEFAULT , 2 }, - { _T("Hello,, world!"), _T(",!"), wxTOKEN_DEFAULT , 3 }, - { _T("Hello,, world!"), _T(",!"), wxTOKEN_STRTOK , 2 }, + { _T(""), _T(" "), wxTOKEN_DEFAULT, 0 }, + { _T(""), _T(" "), wxTOKEN_RET_EMPTY, 0 }, + { _T(""), _T(" "), wxTOKEN_RET_EMPTY_ALL, 0 }, + + { _T("Hello, world"), _T(" "), wxTOKEN_DEFAULT, 2 }, + { _T("Hello, world "), _T(" "), wxTOKEN_DEFAULT, 2 }, + { _T("Hello, world"), _T(","), wxTOKEN_DEFAULT, 2 }, + { _T("Hello, world!"), _T(",!"), wxTOKEN_DEFAULT, 2 }, + { _T("Hello,, world!"), _T(",!"), wxTOKEN_DEFAULT, 3 }, + { _T("Hello,, world!"), _T(",!"), wxTOKEN_STRTOK, 2 }, { _T("Hello, world!"), _T(",!"), wxTOKEN_RET_EMPTY_ALL, 3 }, { _T("username:password:uid:gid:gecos:home:shell"), - _T(":"), wxTOKEN_DEFAULT , 7 }, + _T(":"), wxTOKEN_DEFAULT, 7 }, - { _T("1:2::3:"), _T(":"), wxTOKEN_DEFAULT , 4 }, - { _T("1:2::3:"), _T(":"), wxTOKEN_RET_EMPTY , 4 }, + { _T("1:2::3:"), _T(":"), wxTOKEN_DEFAULT, 4 }, + { _T("1:2::3:"), _T(":"), wxTOKEN_RET_EMPTY, 4 }, { _T("1:2::3:"), _T(":"), wxTOKEN_RET_EMPTY_ALL, 5 }, - { _T("1:2::3:"), _T(":"), wxTOKEN_RET_DELIMS , 4 }, - { _T("1:2::3:"), _T(":"), wxTOKEN_STRTOK , 3 }, + { _T("1:2::3:"), _T(":"), wxTOKEN_RET_DELIMS, 4 }, + { _T("1:2::3:"), _T(":"), wxTOKEN_STRTOK, 3 }, - { _T("1:2::3::"), _T(":"), wxTOKEN_DEFAULT , 5 }, - { _T("1:2::3::"), _T(":"), wxTOKEN_RET_EMPTY , 5 }, + { _T("1:2::3::"), _T(":"), wxTOKEN_DEFAULT, 5 }, + { _T("1:2::3::"), _T(":"), wxTOKEN_RET_EMPTY, 4 }, { _T("1:2::3::"), _T(":"), wxTOKEN_RET_EMPTY_ALL, 6 }, - { _T("1:2::3::"), _T(":"), wxTOKEN_RET_DELIMS , 5 }, - { _T("1:2::3::"), _T(":"), wxTOKEN_STRTOK , 3 }, + { _T("1:2::3::"), _T(":"), wxTOKEN_RET_DELIMS, 5 }, + { _T("1:2::3::"), _T(":"), wxTOKEN_STRTOK, 3 }, - { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, wxTOKEN_DEFAULT , 4 }, - { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, wxTOKEN_STRTOK , 4 }, - { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, wxTOKEN_RET_EMPTY , 6 }, + { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, wxTOKEN_DEFAULT, 4 }, + { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, wxTOKEN_STRTOK, 4 }, + { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, wxTOKEN_RET_EMPTY, 6 }, { _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, wxTOKEN_RET_EMPTY_ALL, 9 }, - { _T("01/02/99"), _T("/-"), wxTOKEN_DEFAULT , 3 }, - { _T("01-02/99"), _T("/-"), wxTOKEN_RET_DELIMS , 3 }, + { _T("01/02/99"), _T("/-"), wxTOKEN_DEFAULT, 3 }, + { _T("01-02/99"), _T("/-"), wxTOKEN_RET_DELIMS, 3 }, }; // ---------------------------------------------------------------------------- @@ -117,7 +119,7 @@ void TokenizerTestCase::GetCount() const TokenizerTestData& ttd = gs_testData[n]; wxStringTokenizer tkz(ttd.str, ttd.delims, ttd.mode); - CPPUNIT_ASSERT( tkz.CountTokens() == ttd.count ); + CPPUNIT_ASSERT_EQUAL( ttd.count, tkz.CountTokens() ); size_t count = 0; while ( tkz.HasMoreTokens() ) -- 2.45.2