Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:18:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix QCOMPARE_WITH_ABS_ERROR for floats

Browse source
This commit is contained in:
Andrew Meadows 2015-08-10 14:45:57 -07:00
parent 6db47e773f
commit 4a8baafdd2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/QTestExtensions.h
View file

@ -57,10 +57,10 @@ QString QTest_generateCompareFailureMessage (
QString s1 = actual_expr, s2 = expected_expr; QString s1 = actual_expr, s2 = expected_expr;
int pad1_ = qMax(s2.length() - s1.length(), 0); int pad1_ = qMax(s2.length() - s1.length(), 0);
int pad2_ = qMax(s1.length() - s2.length(), 0); int pad2_ = qMax(s1.length() - s2.length(), 0);
QString pad1 = QString(")").rightJustified(pad1_, ' '); QString pad1 = QString(")").rightJustified(pad1_, ' ');
QString pad2 = QString(")").rightJustified(pad2_, ' '); QString pad2 = QString(")").rightJustified(pad2_, ' ');
QString msg; QString msg;
QTextStream stream (&msg); QTextStream stream (&msg);
stream << failMessage << "\n\t" stream << failMessage << "\n\t"
@ -88,10 +88,10 @@ QString QTest_generateCompareFailureMessage (
QString s1 = actual_expr, s2 = expected_expr; QString s1 = actual_expr, s2 = expected_expr;
int pad1_ = qMax(s2.length() - s1.length(), 0); int pad1_ = qMax(s2.length() - s1.length(), 0);
int pad2_ = qMax(s1.length() - s2.length(), 0); int pad2_ = qMax(s1.length() - s2.length(), 0);
QString pad1 = QString("): ").rightJustified(pad1_, ' '); QString pad1 = QString("): ").rightJustified(pad1_, ' ');
QString pad2 = QString("): ").rightJustified(pad2_, ' '); QString pad2 = QString("): ").rightJustified(pad2_, ' ');
QString msg; QString msg;
QTextStream stream (&msg); QTextStream stream (&msg);
stream << failMessage << "\n\t" stream << failMessage << "\n\t"
@ -168,7 +168,7 @@ bool QTest_compareWithAbsError(
int line, const char* file, int line, const char* file,
const V& epsilon const V& epsilon
) { ) {
if (abs(getErrorDifference(actual, expected)) > abs(epsilon)) { if (fabsf(getErrorDifference(actual, expected)) > fabsf(epsilon)) {
QTest_failWithMessage( QTest_failWithMessage(
"Compared values are not the same (fuzzy compare)", "Compared values are not the same (fuzzy compare)",
actual, expected, actual_expr, expected_expr, line, file, actual, expected, actual_expr, expected_expr, line, file,
@ -260,7 +260,7 @@ do { \
struct ByteData { struct ByteData {
ByteData (const char* data, size_t length) ByteData (const char* data, size_t length)
: data(data), length(length) {} : data(data), length(length) {}
const char* data; const char* data;
size_t length; size_t length;