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

Fix comparison of size_t values with -1 in base 64 unit test

Browse Source 
This doesn't work correctly in Catch after reverting the commit that
broke compilation with MSVC 9, so we have to live with explicitly using
the values of the correct type.
This commit is contained in:
Vadim Zeitlin
2017-11-23 01:25:39 +01:00
parent bb9cd7a912
commit 166f754973
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/base64/base64.cpp
View File

@@ -291,16 +291,17 @@ void Base64TestCase::DecodeInvalid()
CPPUNIT_ASSERT_EQUAL( wxCONV_FAILED, rc); CPPUNIT_ASSERT_EQUAL( wxCONV_FAILED, rc);
CPPUNIT_ASSERT_EQUAL( 0, posErr ); CPPUNIT_ASSERT_EQUAL( 0, posErr );
posErr = (size_t)-1; const size_t POS_INVALID = -1;
posErr = POS_INVALID;
rc = wxBase64Decode(NULL, 0, " QQ==", wxNO_LEN, rc = wxBase64Decode(NULL, 0, " QQ==", wxNO_LEN,
wxBase64DecodeMode_SkipWS, &posErr); wxBase64DecodeMode_SkipWS, &posErr);
CPPUNIT_ASSERT_EQUAL( 1, rc ); CPPUNIT_ASSERT_EQUAL( 1, rc );
CPPUNIT_ASSERT_EQUAL( -1, posErr ); CPPUNIT_ASSERT_EQUAL( POS_INVALID, posErr );
rc = wxBase64Decode(NULL, 0, "? QQ==", wxNO_LEN, rc = wxBase64Decode(NULL, 0, "? QQ==", wxNO_LEN,
wxBase64DecodeMode_Relaxed, &posErr); wxBase64DecodeMode_Relaxed, &posErr);
CPPUNIT_ASSERT_EQUAL( 1, rc ); CPPUNIT_ASSERT_EQUAL( 1, rc );
CPPUNIT_ASSERT_EQUAL( -1, posErr ); CPPUNIT_ASSERT_EQUAL( POS_INVALID, posErr );
CPPUNIT_ASSERT( !wxBase64Decode("wxGetApp()").GetDataLen() ); CPPUNIT_ASSERT( !wxBase64Decode("wxGetApp()").GetDataLen() );
} }