diff --git a/src/test_lib_json/jsontest.h b/src/test_lib_json/jsontest.h index 207692b..6dc7535 100644 --- a/src/test_lib_json/jsontest.h +++ b/src/test_lib_json/jsontest.h @@ -190,7 +190,7 @@ namespace JsonTest { checkEqual( TestResult &result, const T &expected, const U &actual, const char *file, unsigned int line, const char *expr ) { - if ( expected != actual ) + if ( static_cast< U >( expected ) != actual ) { result.addFailure( file, line, expr ); result << "Expected: " << expected << "\n"; @@ -229,8 +229,7 @@ namespace JsonTest { result_->predicateStackTail_ = &_minitest_Context; \ (expr); \ result_->popPredicateContext(); \ - } \ - *result_ + } /// \brief Asserts that two values are equals. #define JSONTEST_ASSERT_EQUAL( expected, actual ) \ diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index 3e28085..ce4f1f4 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -63,8 +63,8 @@ struct ValueTest : JsonTest::TestCase : emptyArray_( Json::arrayValue ) , emptyObject_( Json::objectValue ) , integer_( 123456789 ) - , smallUnsignedInteger_( Json::Value::UInt( Json::Value::maxInt ) ) , unsignedInteger_( 34567890u ) + , smallUnsignedInteger_( Json::Value::UInt( Json::Value::maxInt ) ) , real_( 1234.56789 ) , float_( 0.00390625f ) , emptyString_( "" )