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

Remove redundant wxUSE_WXVSNPRINTF checks from the unit test.

Browse Source 
The entire VsnprintfTestCase is only used when using our own
wxUSE_WXVSNPRINTF so remove the redundant tests for it inside the enclosing #if.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-03 17:15:04 +00:00
parent 6acd08bc95
commit 89ff7e9fb1
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/strings/vsnprintf.cpp
View File

@@ -139,9 +139,7 @@ private:
#endif #endif
CPPUNIT_TEST( BigToSmallBuffer ); CPPUNIT_TEST( BigToSmallBuffer );
#if wxUSE_WXVSNPRINTF
CPPUNIT_TEST( WrongFormatStrings ); CPPUNIT_TEST( WrongFormatStrings );
#endif // wxUSE_WXVSNPRINTF
CPPUNIT_TEST( Miscellaneous ); CPPUNIT_TEST( Miscellaneous );
CPPUNIT_TEST( GlibcMisc1 ); CPPUNIT_TEST( GlibcMisc1 );
CPPUNIT_TEST( GlibcMisc2 ); CPPUNIT_TEST( GlibcMisc2 );
@@ -168,9 +166,7 @@ private:
void DoBigToSmallBuffer(T *buffer, int size); void DoBigToSmallBuffer(T *buffer, int size);
void BigToSmallBuffer(); void BigToSmallBuffer();
#if wxUSE_WXVSNPRINTF
void WrongFormatStrings(); void WrongFormatStrings();
#endif // wxUSE_WXVSNPRINTF
// compares the expectedString and the result of wxVsnprintf() char by char // compares the expectedString and the result of wxVsnprintf() char by char
// for all its lenght (not only for first expectedLen chars) and also // for all its lenght (not only for first expectedLen chars) and also
@@ -424,12 +420,6 @@ void VsnprintfTestCase::LongLong()
} }
#endif #endif
// this test is only for our own implementation, the system implementation
// doesn't always give errors for invalid format strings (e.g. glibc doesn't)
// and as it's not required too (the behaviour is "undefined" according to the
// spec), there is really no sense in testing for it
#if wxUSE_WXVSNPRINTF
void VsnprintfTestCase::WrongFormatStrings() void VsnprintfTestCase::WrongFormatStrings()
{ {
// test how wxVsnprintf() behaves with wrong format string: // test how wxVsnprintf() behaves with wrong format string:
@@ -456,8 +446,6 @@ void VsnprintfTestCase::WrongFormatStrings()
CPPUNIT_ASSERT_EQUAL(-1, r); CPPUNIT_ASSERT_EQUAL(-1, r);
} }
#endif // wxUSE_WXVSNPRINTF
// BigToSmallBuffer() test case helper: // BigToSmallBuffer() test case helper:
template<typename T> template<typename T>
void VsnprintfTestCase::DoBigToSmallBuffer(T *buffer, int size) void VsnprintfTestCase::DoBigToSmallBuffer(T *buffer, int size)