From 4a8baafdd206f14f18b5358f64df92de050777d0 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 10 Aug 2015 14:45:57 -0700 Subject: [PATCH] fix QCOMPARE_WITH_ABS_ERROR for floats --- tests/QTestExtensions.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/QTestExtensions.h b/tests/QTestExtensions.h index c374a9a507..c034e9c290 100644 --- a/tests/QTestExtensions.h +++ b/tests/QTestExtensions.h @@ -57,10 +57,10 @@ QString QTest_generateCompareFailureMessage ( QString s1 = actual_expr, s2 = expected_expr; int pad1_ = qMax(s2.length() - s1.length(), 0); int pad2_ = qMax(s1.length() - s2.length(), 0); - + QString pad1 = QString(")").rightJustified(pad1_, ' '); QString pad2 = QString(")").rightJustified(pad2_, ' '); - + QString msg; QTextStream stream (&msg); stream << failMessage << "\n\t" @@ -88,10 +88,10 @@ QString QTest_generateCompareFailureMessage ( QString s1 = actual_expr, s2 = expected_expr; int pad1_ = qMax(s2.length() - s1.length(), 0); int pad2_ = qMax(s1.length() - s2.length(), 0); - + QString pad1 = QString("): ").rightJustified(pad1_, ' '); QString pad2 = QString("): ").rightJustified(pad2_, ' '); - + QString msg; QTextStream stream (&msg); stream << failMessage << "\n\t" @@ -168,7 +168,7 @@ bool QTest_compareWithAbsError( int line, const char* file, const V& epsilon ) { - if (abs(getErrorDifference(actual, expected)) > abs(epsilon)) { + if (fabsf(getErrorDifference(actual, expected)) > fabsf(epsilon)) { QTest_failWithMessage( "Compared values are not the same (fuzzy compare)", actual, expected, actual_expr, expected_expr, line, file, @@ -260,7 +260,7 @@ do { \ struct ByteData { - ByteData (const char* data, size_t length) + ByteData (const char* data, size_t length) : data(data), length(length) {} const char* data; size_t length;