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

Fix signed/unsigned comparison warnings in wxVsnprintf test

Browse Source 
These warnings only appeared in build configurations using our own
implementation, i.e. not in the default build.
This commit is contained in:
Vadim Zeitlin
2020-11-30 17:10:05 +01:00
parent bdc18f68b6
commit f4db86cc77
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/strings/vsnprintf.cpp
View File

@@ -50,27 +50,27 @@ int r;
#define CMP6(expected, fmt, y, z, w, t) \ #define CMP6(expected, fmt, y, z, w, t) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w, t); \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w, t); \
CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf ); ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP5(expected, fmt, y, z, w) \ #define CMP5(expected, fmt, y, z, w) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w); \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w); \
CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf ); ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP4(expected, fmt, y, z) \ #define CMP4(expected, fmt, y, z) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z); \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z); \
CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf ); ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP3(expected, fmt, y) \ #define CMP3(expected, fmt, y) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y); \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y); \
CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf ); ASSERT_STR_EQUAL( wxT(expected), buf );
#define CMP2(expected, fmt) \ #define CMP2(expected, fmt) \
r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt)); \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt)); \
CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \
ASSERT_STR_EQUAL( wxT(expected), buf ); ASSERT_STR_EQUAL( wxT(expected), buf );
// NOTE: this macro is used also with too-small buffers (see Miscellaneous()) // NOTE: this macro is used also with too-small buffers (see Miscellaneous())
@@ -354,7 +354,7 @@ void VsnprintfTestCase::S()
#define CMP3_UTF8(expected, fmt, arg) \ #define CMP3_UTF8(expected, fmt, arg) \
CPPUNIT_ASSERT_EQUAL \ CPPUNIT_ASSERT_EQUAL \
( \ ( \
wxString::FromUTF8(expected).length(), \ (int)wxString::FromUTF8(expected).length(), \
wxSnprintf(buf, MAX_TEST_LEN, fmt, wxString::FromUTF8(arg)) \ wxSnprintf(buf, MAX_TEST_LEN, fmt, wxString::FromUTF8(arg)) \
); \ ); \
CPPUNIT_ASSERT_EQUAL \ CPPUNIT_ASSERT_EQUAL \