From 7ce0c58f8d5a0cf156be4e336f7ec086e104c200 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 31 Mar 2006 19:24:23 +0000 Subject: [PATCH] the expected test result was wrong, corrected; also define a manifest constant only once instead of using its value everywhere git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/strings/unicode.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp index bf2aace2cc..3ccf6be1db 100644 --- a/tests/strings/unicode.cpp +++ b/tests/strings/unicode.cpp @@ -138,14 +138,18 @@ void UnicodeTestCase::ConstructorsWithConversion() void UnicodeTestCase::Conversion() { #if wxUSE_UNICODE - wxString szTheString(L"The\0String", wxConvLibc, 10); + static const size_t lenNulString = 10; + + wxString szTheString(L"The\0String", wxConvLibc, lenNulString); wxCharBuffer theBuffer = szTheString.mb_str(); - CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", 11) == 0 ); + CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", + lenNulString + 1) == 0 ); - wxString szTheString2("The\0String", wxConvLocal, 10); - CPPUNIT_ASSERT( szTheString2.length() == 11 ); - CPPUNIT_ASSERT( wxTmemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 ); + wxString szTheString2("The\0String", wxConvLocal, lenNulString); + CPPUNIT_ASSERT_EQUAL( lenNulString, szTheString2.length() ); + CPPUNIT_ASSERT( wxTmemcmp(szTheString2.c_str(), L"The\0String", + lenNulString + 1) == 0 ); #else wxString szTheString(wxT("TheString")); szTheString.insert(3, 1, '\0'); -- 2.47.2