From 8934979ba103df381ad5186ddb362220c3c07610 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 12 May 2016 09:25:15 +0200 Subject: [PATCH] timeAgo test: Fix for qt4, clean up --- test/testutility.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/test/testutility.cpp b/test/testutility.cpp index a2cfffa97..b8f8c1ac9 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -136,34 +136,27 @@ private slots: void testTimeAgo() { - // Both times in local time + // Both times in same timezone QDateTime d1 = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate); QDateTime d2 = QDateTime::fromString("2015-01-23T09:20:30+01:00", Qt::ISODate); QString s = timeAgoInWords(d2, d1); QCOMPARE(s, QLatin1String("1 day(s) ago")); - // + // Different timezones QDateTime earlyTS = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate); - earlyTS.setTimeSpec(Qt::UTC); - QDateTime laterTS = earlyTS.toOffsetFromUtc(3600); - laterTS.setTimeSpec(Qt::UTC); + QDateTime laterTS = QDateTime::fromString("2015-01-24T09:20:30-01:00", Qt::ISODate); s = timeAgoInWords(earlyTS, laterTS); - QCOMPARE(s, QLatin1String("1 hour(s) ago")); + QCOMPARE(s, QLatin1String("2 hour(s) ago")); + // 'Now' in whatever timezone earlyTS = QDateTime::currentDateTime(); - - laterTS.setTimeSpec(Qt::LocalTime); - laterTS.setTimeZone( QTimeZone("Pacific/Easter") ); laterTS = earlyTS; - s = timeAgoInWords(earlyTS, laterTS ); QCOMPARE(s, QLatin1String("now")); earlyTS = earlyTS.addSecs(-6); s = timeAgoInWords(earlyTS, laterTS ); QCOMPARE(s, QLatin1String("Less than a minute ago")); - - } }; -- 2.39.5