ilusha/unittest-cpp
1
0
Fork 0
mirror of https://github.com/unittest-cpp/unittest-cpp synced 2026-09-26 16:19:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #28 from pjohnmeyer/fixCheckEqualCrashForLargeNumbers

Browse source 
Changed sprintf to snprintf in MemoryOutStream::FormatToStream. Fixes #18.
This commit is contained in:
Patrick Johnmeyer 2013-02-08 18:46:04 -08:00
commit e6c93118aa
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/MemoryOutStream.cpp
View file

@ -32,8 +32,9 @@ void FormatToStream(MemoryOutStream& stream, char const* format, ValueType const
{
using namespace std;
char txt[32];
sprintf(txt, format, value);
const size_t BUFFER_SIZE=32;
char txt[BUFFER_SIZE];
snprintf(txt, BUFFER_SIZE, format, value);
stream << txt;
}
@ -127,7 +128,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned long long const n)
MemoryOutStream& MemoryOutStream::operator <<(float const f)
{
FormatToStream(*this, "%ff", f);
FormatToStream(*this, "%0.6f", f);
return *this;
}
@ -145,7 +146,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned int const s)
MemoryOutStream& MemoryOutStream::operator <<(double const d)
{
FormatToStream(*this, "%f", d);
FormatToStream(*this, "%0.6f", d);
return *this;
}

14
src/tests/TestMemoryOutStream.cpp
View file

@ -4,6 +4,7 @@
#include <cstring>
#include <climits>
#include <cstdlib>
#include <cfloat>
using namespace UnitTest;
using namespace std;
@ -152,15 +153,15 @@ TEST(WritingStringLongerThanCapacityFitsInNewBuffer)
TEST(WritingIntLongerThanCapacityFitsInNewBuffer)
{
MemoryOutStream stream(8);
stream << "aaaa" << 123456;;
stream << "aaaa" << 123456;
CHECK_EQUAL("aaaa123456", stream.GetText());
}
TEST(WritingFloatLongerThanCapacityFitsInNewBuffer)
{
MemoryOutStream stream(8);
stream << "aaaa" << 123456.0f;;
CHECK_EQUAL("aaaa123456.000000f", stream.GetText());
stream << "aaaa" << 123456.0f;
CHECK_EQUAL("aaaa123456.000000", stream.GetText());
}
TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)
@ -170,6 +171,13 @@ TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)
CHECK_EQUAL("aaaa32145", stream.GetText());
}
TEST(VerifyLargeDoubleCanBeStreamedWithoutCrashing)
{
MemoryOutStream stream(8);
stream << DBL_MAX;
CHECK(true);
}
#endif
}