From 310e4350ffc37513d990cbede580cd7de5ec582a Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Tue, 18 Jul 2017 13:30:15 +0200 Subject: Adapt tests to the new QDateTime debug output behavior Invalid QDateTimes (like the default-constructed ones) now output "QDateTime(Invalid)". Temporarily the test is disabled until qt5.git integration passes such that the QDateTime debug operator stream becomes available in the Qt CI. Change-Id: I3c461e55f0300b8bc040761b8c181fe8abf63abe Reviewed-by: Paolo Angelelli --- tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp index 75c1eecb..afd8a3fa 100644 --- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp +++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp @@ -720,14 +720,14 @@ private slots: QGeoAreaMonitorInfo info; QTest::newRow("uninitialized") << info << 45 << QString("QGeoAreaMonitorInfo(\"\", QGeoShape(Unknown), " - "persistent: false, expiry: QDateTime( Qt::TimeSpec(LocalTime))) 45"); + "persistent: false, expiry: QDateTime(Invalid)) 45"); info.setArea(QGeoRectangle()); info.setPersistent(true); info.setName("RectangleAreaMonitor"); QTest::newRow("Rectangle Test") << info << 45 << QString("QGeoAreaMonitorInfo(\"RectangleAreaMonitor\", QGeoShape(Rectangle), " - "persistent: true, expiry: QDateTime( Qt::TimeSpec(LocalTime))) 45"); + "persistent: true, expiry: QDateTime(Invalid)) 45"); info = QGeoAreaMonitorInfo(); info.setArea(QGeoCircle()); @@ -738,7 +738,7 @@ private slots: info.setNotificationParameters(map); QTest::newRow("Circle Test") << info << 45 << QString("QGeoAreaMonitorInfo(\"CircleAreaMonitor\", QGeoShape(Circle), " - "persistent: false, expiry: QDateTime( Qt::TimeSpec(LocalTime))) 45"); + "persistent: false, expiry: QDateTime(Invalid)) 45"); // we ignore any further QDateTime related changes to avoid depending on QDateTime related // failures in case its QDebug string changes @@ -746,6 +746,7 @@ private slots: void debug() { + QSKIP("Waiting for upcoming QDateTime debug operator changes being integrated"); QFETCH(QGeoAreaMonitorInfo, info); QFETCH(int, nextValue); QFETCH(QString, debugString); -- cgit v1.2.1