diff options
| author | Christian Kamm <mail@ckamm.de> | 2016-11-22 15:09:56 +0300 |
|---|---|---|
| committer | Christian Kamm <mail@ckamm.de> | 2016-11-23 18:47:56 +0300 |
| commit | 3e59a9b31600270b7c037c3b6149a51292626b3b (patch) | |
| tree | 27c9e56492757576f43b584dca1790b435dbcb99 /test/testutility.cpp | |
| parent | 16e28567a63bf3ca9ac44de0e35833bb0db5c93e (diff) | |
| parent | 4998303c424d8ea050da30d2dd426a2472c8301b (diff) | |
Merge branch 'master' into dbjournal_per_account
Diffstat (limited to 'test/testutility.cpp')
| -rw-r--r-- | test/testutility.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/test/testutility.cpp b/test/testutility.cpp index 63015f053..7c1f65227 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -67,14 +67,6 @@ private slots: QVERIFY(hasLaunchOnStartup(appName) == false); } - void testToCSyncScheme() - { - QVERIFY(toCSyncScheme("http://example.com/owncloud/") == - "owncloud://example.com/owncloud/"); - QVERIFY(toCSyncScheme("https://example.com/owncloud/") == - "ownclouds://example.com/owncloud/"); - } - void testDurationToDescriptiveString() { QLocale::setDefault(QLocale("C")); @@ -83,7 +75,7 @@ private slots: quint64 sec = 1000; quint64 hour = 3600 * sec; - QDateTime current = QDateTime::currentDateTime(); + QDateTime current = QDateTime::currentDateTimeUtc(); QCOMPARE(durationToDescriptiveString2(0), QString("0 second(s)") ); QCOMPARE(durationToDescriptiveString2(5), QString("0 second(s)") ); |