timeAgo test: Fix for qt4, clean up

diff --git a/test/testutility.cpp b/test/testutility.cpp
index a2cfffa97b884b72f495f5061d2d25403ece2394..b8f8c1ac9665ad3954b0c01820af4831a4bad165 100644 (file)
--- 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"));
-
-
     }
 };