[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.8] kdecore/tests: Fix unit test failure
From:       David Jarvie <djarvie () kde ! org>
Date:       2012-04-05 0:04:40
Message-ID: 20120405000440.B4E64A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 82fe924a3e4bd68e65b167510749e3c961d8f1af by David Jarvie.
Committed on 05/04/2012 at 00:04.
Pushed by djarvie into branch 'KDE/4.8'.

Fix unit test failure

A  +-    --    kdecore/tests/Berlin
M  +-    --    kdecore/tests/Los_Angeles
M  +5    -5    kdecore/tests/kdatetimetest.cpp

http://commits.kde.org/kdelibs/82fe924a3e4bd68e65b167510749e3c961d8f1af

diff --git a/kdecore/tests/Berlin b/kdecore/tests/Berlin
new file mode 100644
index 0000000..96059c7
Binary files /dev/null and b/kdecore/tests/Berlin differ
diff --git a/kdecore/tests/Los_Angeles b/kdecore/tests/Los_Angeles
index 2460278..3b7ce1d 100644
Binary files a/kdecore/tests/Los_Angeles and b/kdecore/tests/Los_Angeles di=
ffer
diff --git a/kdecore/tests/kdatetimetest.cpp b/kdecore/tests/kdatetimetest.=
cpp
index f40c9b8..8b35b72 100644
--- a/kdecore/tests/kdatetimetest.cpp
+++ b/kdecore/tests/kdatetimetest.cpp
@@ -56,13 +56,13 @@ void KDateTimeTest::initTestCase()
     f.close();
     QDir dir(mDataDir);
     QVERIFY(dir.mkdir("Africa"));
-    QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/Cairo"), =
mDataDir + QLatin1String("/Africa/Cairo"));
+    QVERIFY(QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/C=
airo"), mDataDir + QLatin1String("/Africa/Cairo")));
     QVERIFY(dir.mkdir("America"));
-    QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/Los_Angel=
es"), mDataDir + QLatin1String("/America/Los_Angeles"));
+    QVERIFY(QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/L=
os_Angeles"), mDataDir + QLatin1String("/America/Los_Angeles")));
     QVERIFY(dir.mkdir("Europe"));
-    QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/Berlin"),=
 mDataDir + QLatin1String("/Europe/Berlin"));
-    QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/London"),=
 mDataDir + QLatin1String("/Europe/London"));
-    QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/Paris"), =
mDataDir + QLatin1String("/Europe/Paris"));
+    QVERIFY(QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/B=
erlin"), mDataDir + QLatin1String("/Europe/Berlin")));
+    QVERIFY(QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/L=
ondon"), mDataDir + QLatin1String("/Europe/London")));
+    QVERIFY(QFile::copy(QString::fromLatin1(KDESRCDIR) + QLatin1String("/P=
aris"), mDataDir + QLatin1String("/Europe/Paris")));
 =

     KConfig config("ktimezonedrc");
     KConfigGroup group(&config, "TimeZones");
[prev in list] [next in list] [prev in thread] [next in thread]