Made jsontest work with 64-bit integers, and fixed an error.

This commit is contained in:
Aaron Jacobs 2011-05-26 00:12:48 +00:00
parent b6620e2801
commit 2a2b5cf3ad
2 changed files with 24 additions and 0 deletions

View File

@ -275,6 +275,25 @@ TestResult::operator << ( unsigned int value )
}
#ifdef JSON_HAS_INT64
TestResult &
TestResult::operator << ( Json::Int64 value )
{
char buffer[32];
sprintf( buffer, "%lld", value );
return addToLastFailure( buffer );
}
TestResult &
TestResult::operator << ( Json::UInt64 value )
{
char buffer[32];
sprintf( buffer, "%ull", value );
return addToLastFailure( buffer );
}
#endif
TestResult &
TestResult::operator << ( double value )
{

View File

@ -87,6 +87,10 @@ namespace JsonTest {
TestResult &operator << ( bool value );
TestResult &operator << ( int value );
TestResult &operator << ( unsigned int value );
#ifdef JSON_HAS_INT64
TestResult &operator << ( Json::Int64 value );
TestResult &operator << ( Json::UInt64 value );
#endif
TestResult &operator << ( double value );
TestResult &operator << ( const char *value );
TestResult &operator << ( const std::string &value );
@ -229,6 +233,7 @@ namespace JsonTest {
#define JSONTEST_ASSERT_STRING_EQUAL( expected, actual ) \
JsonTest::checkStringEqual( *result_, \
std::string(expected), std::string(actual), \
__FILE__, __LINE__, \
#expected " == " #actual )
/// \brief Begin a fixture test case.