1 files changed, 88 insertions, 33 deletions

diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index 9fde7da816..9f4e1773c8 100644
--- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
@@ -29,6 +29,7 @@
 #include <QtTest/QtTest>
 #include <qtranslator.h>
 #include <qfile.h>
+#include <qtemporarydir.h>
 
 class tst_QTranslator : public QObject
 {
@@ -40,9 +41,11 @@ protected:
     bool eventFilter(QObject *obj, QEvent *event);
 private slots:
     void initTestCase();
+    void init();
 
     void load_data();
     void load();
+    void loadLocale();
     void threadLoad();
     void testLanguageChange();
     void plural();
@@ -64,38 +67,14 @@ tst_QTranslator::tst_QTranslator()
 
 void tst_QTranslator::initTestCase()
 {
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
-    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)
-#ifdef Q_OS_WINRT
-    // ### TODO: Use this for all platforms in 5.7
-    dataDir = QEXTRACTTESTDATA(QStringLiteral("/"));
+    dataDir = QEXTRACTTESTDATA(QStringLiteral("/tst_qtranslator"));
     QVERIFY2(!dataDir.isNull(), qPrintable("Could not extract test data"));
-    QVERIFY2(QDir::setCurrent(dataDir->path()), qPrintable("Could not chdir to " + dataDir->path()));
-#else // !Q_OS_WINRT
-    QString testdata_dir = QFileInfo(QFINDTESTDATA("hellotr_la.qm")).absolutePath();
-    QVERIFY2(QDir::setCurrent(testdata_dir), qPrintable("Could not chdir to " + testdata_dir));
-#endif // !Q_OS_WINRT
+}
 
+void tst_QTranslator::init()
+{
+    QVERIFY2(QDir::setCurrent(dataDir->path()),
+             qPrintable("Could not chdir to " + dataDir->path()));
 }
 
 bool tst_QTranslator::eventFilter(QObject *, QEvent *event)
@@ -155,6 +134,73 @@ void tst_QTranslator::load()
     }
 }
 
+void tst_QTranslator::loadLocale()
+{
+    QLocale locale;
+    auto localeName = locale.uiLanguages().value(0).replace('-', '_');
+    if (localeName.isEmpty())
+        QSKIP("This test requires at least one available UI language.");
+
+    QByteArray ba;
+    {
+        QFile file(":/tst_qtranslator/hellotr_la.qm");
+        QVERIFY2(file.open(QFile::ReadOnly), qPrintable(file.errorString()));
+        ba = file.readAll();
+        QVERIFY(!ba.isEmpty());
+    }
+
+    QTemporaryDir dir;
+    QVERIFY(dir.isValid());
+
+    auto path = dir.path();
+    QFile file(path + "/dummy");
+    QVERIFY2(file.open(QFile::WriteOnly), qPrintable(file.errorString()));
+    QCOMPARE(file.write(ba), ba.size());
+    file.close();
+
+    /*
+        Test the following order:
+
+        /tmp/tmpDir/foo-en_US.qm
+        /tmp/tmpDir/foo-en_US
+        /tmp/tmpDir/foo-en.qm
+        /tmp/tmpDir/foo-en
+        /tmp/tmpDir/foo.qm
+        /tmp/tmpDir/foo-
+        /tmp/tmpDir/foo
+    */
+
+    QStringList files;
+    while (true) {
+        files.append(path + "/foo-" + localeName + ".qm");
+        QVERIFY2(file.copy(files.last()), qPrintable(file.errorString()));
+
+        files.append(path + "/foo-" + localeName);
+        QVERIFY2(file.copy(files.last()), qPrintable(file.errorString()));
+
+        int rightmost = localeName.lastIndexOf(QLatin1Char('_'));
+        if (rightmost <= 0)
+            break;
+        localeName.truncate(rightmost);
+    }
+
+    files.append(path + "/foo.qm");
+    QVERIFY2(file.copy(files.last()), qPrintable(file.errorString()));
+
+    files.append(path + "/foo-");
+    QVERIFY2(file.copy(files.last()), qPrintable(file.errorString()));
+
+    files.append(path + "/foo");
+    QVERIFY2(file.rename(files.last()), qPrintable(file.errorString()));
+
+    QTranslator tor;
+    for (const auto &filePath : files) {
+        QVERIFY(tor.load(locale, "foo", "-", path, ".qm"));
+        QCOMPARE(tor.filePath(), filePath);
+        QVERIFY2(file.remove(filePath), qPrintable(file.errorString()));
+    }
+}
+
 class TranslatorThread : public QThread
 {
     void run() {
@@ -307,6 +353,15 @@ void tst_QTranslator::dependencies()
         QVERIFY(!tor.isEmpty());
         QCOMPARE(tor.translate("QPushButton", "Hello world!"), QLatin1String("Hallo Welt!"));
     }
+
+    {
+        // Test resolution of paths relative to main file
+        const QString absoluteFile = QFileInfo("dependencies_la").absoluteFilePath();
+        QDir::setCurrent(QDir::tempPath());
+        QTranslator tor;
+        QVERIFY(tor.load(absoluteFile));
+        QVERIFY(!tor.isEmpty());
+    }
 }
 
 struct TranslateThread : public QThread
@@ -346,9 +401,9 @@ void tst_QTranslator::translationInThreadWhileInstallingTranslator()
 
     thread.runningCondition.wait(&thread.startupLock);
 
-    QTranslator *tor = new QTranslator;
-    tor->load("hellotr_la");
-    QCoreApplication::installTranslator(tor);
+    QTranslator tor;
+    tor.load("hellotr_la");
+    QCoreApplication::installTranslator(&tor);
 
     ++thread.terminate;