From 82e699cab0eb6a209c06607e297803fd127f5e63 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 26 Feb 2014 09:18:35 +0100 Subject: [PATCH] tst_qtjson: Mark some test as XFAIL on BlackBerry 10 These tests seem to fail because denormalized numbers are not supported on QNX yet, so marking them as expected failures. - testNumbers_2() - toJsonLargeNumericValues() - parseNumbers() Task-number: QTBUG-37066 Change-Id: Ifec95b936fb70253395dee4d1ca18e85870486a3 Reviewed-by: Fabian Bumberger --- tests/auto/corelib/json/tst_qtjson.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index aee5875613..6736a33405 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -360,6 +360,10 @@ void tst_QtJson::testNumbers_2() QJsonDocument jDocument2(QJsonDocument::fromJson(ba)); for (int power = 0; power <= 1075; power++) { floatValues_1[power] = jDocument2.object().value(QString::number(power)).toDouble(); +#ifdef Q_OS_BLACKBERRY + if (power >= 970) + QEXPECT_FAIL("", "See QTBUG-37066", Abort); +#endif QVERIFY2(floatValues[power] == floatValues_1[power], QString("floatValues[%1] != floatValues_1[%1]").arg(power).toLatin1()); } @@ -1299,11 +1303,17 @@ void tst_QtJson::toJsonLargeNumericValues() " ]\n" "}\n"; +#ifdef Q_OS_BLACKBERRY + QEXPECT_FAIL("", "See QTBUG-37066", Continue); +#endif QCOMPARE(json, expected); QJsonDocument doc; doc.setObject(object); json = doc.toJson(); +#ifdef Q_OS_BLACKBERRY + QEXPECT_FAIL("", "See QTBUG-37066", Continue); +#endif QCOMPARE(json, expected); } @@ -1705,6 +1715,10 @@ void tst_QtJson::parseNumbers() json += numbers[i].str; json += " ]"; QJsonDocument doc = QJsonDocument::fromJson(json); +#ifdef Q_OS_BLACKBERRY + if (0 == QString::compare(numbers[i].str, "1.1e-308")) + QEXPECT_FAIL("", "See QTBUG-37066", Abort); +#endif QVERIFY(!doc.isEmpty()); QCOMPARE(doc.isArray(), true); QCOMPARE(doc.isObject(), false);