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

use CPPUNIT_ASSERT_EQUAL(x,y) instead of CPPUNIT_ASSERT(x==y) to better see test failures

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-15 17:38:03 +00:00
parent b161b1549c
commit fa0584f14d
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/strings/unicode.cpp
View File

@@ -130,35 +130,36 @@ void UnicodeTestCase::ConstructorsWithConversion()
wxString s2(wchar, wxConvUTF8);
#if wxUSE_UNICODE
CPPUNIT_ASSERT( s1 == wchar );
CPPUNIT_ASSERT( s2 == wchar );
WX_ASSERT_STR_EQUAL( wchar, s1 );
WX_ASSERT_STR_EQUAL( wchar, s2 );
#else
CPPUNIT_ASSERT( s1 == utf8 );
CPPUNIT_ASSERT( s2 == utf8 );
WX_ASSERT_STR_EQUAL( utf8, s1 );
WX_ASSERT_STR_EQUAL( utf8, s2 );
#endif
wxString sub(utf8sub, wxConvUTF8); // "Dej" substring
wxString s3(utf8, wxConvUTF8, 4);
wxString s4(wchar, wxConvUTF8, 3);
CPPUNIT_ASSERT( s3 == sub );
CPPUNIT_ASSERT( s4 == sub );
CPPUNIT_ASSERT_EQUAL( sub, s3 );
CPPUNIT_ASSERT_EQUAL( sub, s4 );
#if wxUSE_UNICODE
CPPUNIT_ASSERT ( wxString("\t[pl]open.format.Sformatuj dyskietk<74>=gfloppy %f",
wxConvUTF8) == wxT("") ); //should stop at pos 35
// conversion should stop with failure at pos 35
wxString s("\t[pl]open.format.Sformatuj dyskietk<74>=gfloppy %f", wxConvUTF8);
CPPUNIT_ASSERT( s.empty() );
#endif
// test using Unicode strings together with char* strings (this must work
// in ANSI mode as well, of course):
wxString s5("ascii");
CPPUNIT_ASSERT( s5 == "ascii" );
WX_ASSERT_STR_EQUAL( "ascii", s5 );
s5 += " value";
CPPUNIT_ASSERT( strcmp(s5.mb_str(), "ascii value") == 0 );
CPPUNIT_ASSERT( s5 == "ascii value" );
WX_ASSERT_STR_EQUAL( "ascii value", s5 );
CPPUNIT_ASSERT( s5 != "SomethingElse" );
}