From 75f05781240671f3dcf3ae49a547e72e4282d2f0 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Date: Fri, 19 Dec 2014 15:01:38 +0100
Subject: Android: Fix QTranslator tests

Bundle test data in qrc on Android. Extract it, as the tests
expect to find it in the file system.

Change-Id: I251eca3c23141a608b1cbac5ee0b7164c068f9b4
Reviewed-by: BogDan Vatra <bogdan@kde.org>
---
 .../corelib/kernel/qtranslator/android_testdata.qrc  |  7 +++++++
 .../auto/corelib/kernel/qtranslator/qtranslator.pro  |  4 +++-
 .../corelib/kernel/qtranslator/tst_qtranslator.cpp   | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/corelib/kernel/qtranslator/android_testdata.qrc

(limited to 'tests/auto/corelib/kernel')

diff --git a/tests/auto/corelib/kernel/qtranslator/android_testdata.qrc b/tests/auto/corelib/kernel/qtranslator/android_testdata.qrc
new file mode 100644
index 0000000000..b33995ef21
--- /dev/null
+++ b/tests/auto/corelib/kernel/qtranslator/android_testdata.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/android_testdata">
+        <file>hellotr_la.qm</file>
+        <file>msgfmt_from_po.qm</file>
+        <file>dependencies_la.qm</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
index 41c3dea924..e588f44370 100644
--- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
+++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
@@ -4,4 +4,6 @@ QT = core testlib
 SOURCES = tst_qtranslator.cpp
 RESOURCES += qtranslator.qrc
 
-TESTDATA += hellotr_la.qm msgfmt_from_po.qm
+android:!android-no-sdk: RESOURCES += android_testdata.qrc
+else: TESTDATA += hellotr_la.qm msgfmt_from_po.qm
+
diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index 802d649496..077da6fce8 100644
--- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
@@ -68,6 +68,26 @@ tst_QTranslator::tst_QTranslator()
 
 void tst_QTranslator::initTestCase()
 {
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+    QString sourceDir(":/android_testdata/");
+    QDirIterator it(sourceDir, QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        it.next();
+
+        QFileInfo sourceFileInfo = it.fileInfo();
+        if (!sourceFileInfo.isDir()) {
+            QFileInfo destinationFileInfo(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/') + sourceFileInfo.filePath().mid(sourceDir.length()));
+
+            if (!destinationFileInfo.exists()) {
+                QVERIFY(QDir().mkpath(destinationFileInfo.path()));
+                QVERIFY(QFile::copy(sourceFileInfo.filePath(), destinationFileInfo.filePath()));
+            }
+        }
+    }
+
+    QDir::setCurrent(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
+#endif
+
     // chdir into the directory containing our testdata,
     // to make the code simpler (load testdata via relative paths)
     QString testdata_dir = QFileInfo(QFINDTESTDATA("hellotr_la.qm")).absolutePath();
-- 
cgit v1.2.3