summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp')
-rw-r--r--tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp139
1 files changed, 48 insertions, 91 deletions
diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index 3e7790d6ac..f214572cfa 100644
--- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QTest>
#include <QWaitCondition>
@@ -34,7 +9,7 @@
#include <qfile.h>
#include <qtemporarydir.h>
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
+#ifdef Q_OS_ANDROID
#include <QDirIterator>
#endif
@@ -48,9 +23,11 @@ protected:
bool eventFilter(QObject *obj, QEvent *event) override;
private slots:
void initTestCase();
+ void init();
void load_data();
void load();
+ void loadLocale_data();
void loadLocale();
void threadLoad();
void testLanguageChange();
@@ -73,38 +50,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)
-#if 0
- // ### 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
- QString testdata_dir = QFileInfo(QFINDTESTDATA("hellotr_la.qm")).absolutePath();
- QVERIFY2(QDir::setCurrent(testdata_dir), qPrintable("Could not chdir to " + testdata_dir));
-#endif
+}
+void tst_QTranslator::init()
+{
+ QVERIFY2(QDir::setCurrent(dataDir->path()),
+ qPrintable("Could not chdir to " + dataDir->path()));
}
bool tst_QTranslator::eventFilter(QObject *, QEvent *event)
@@ -143,7 +96,7 @@ void tst_QTranslator::load()
{
QFile file(filepath);
- file.open(QFile::ReadOnly);
+ QVERIFY(file.open(QFile::ReadOnly));
QByteArray data = file.readAll();
QTranslator tor;
QVERIFY(tor.load((const uchar *)data.constData(), data.length()));
@@ -164,12 +117,23 @@ void tst_QTranslator::load()
}
}
+void tst_QTranslator::loadLocale_data()
+{
+ QTest::addColumn<QString>("localeName");
+ QTest::addColumn<QStringList>("fileNames");
+
+ QTest::addRow("US English")
+ << "en_US"
+ << QStringList{"en_US.qm", "en_US", "en.qm", "en"};
+ QTest::addRow("Australia")
+ << "en_AU"
+ << QStringList{"en_Latn_AU.qm", "en_AU.qm", "en.qm"};
+}
+
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.");
+ QFETCH(const QString, localeName);
+ QFETCH(const QStringList, fileNames);
QByteArray ba;
{
@@ -182,36 +146,16 @@ void tst_QTranslator::loadLocale()
QTemporaryDir dir;
QVERIFY(dir.isValid());
- auto path = dir.path();
+ const 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);
+ for (const auto &fileName : fileNames) {
+ files.append(path + "/foo-" + fileName);
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");
@@ -223,10 +167,14 @@ void tst_QTranslator::loadLocale()
files.append(path + "/foo");
QVERIFY2(file.rename(files.last()), qPrintable(file.errorString()));
+ QLocale locale(localeName);
QTranslator tor;
for (const auto &filePath : files) {
QVERIFY(tor.load(locale, "foo", "-", path, ".qm"));
- QCOMPARE(tor.filePath(), filePath);
+ // As the file system might be case insensitive, we can't guarantee that
+ // the casing of the file name is preserved. The order of loading
+ // en_AU vs en_au if both exist is undefined anyway.
+ QCOMPARE(tor.filePath().toLower(), filePath.toLower());
QVERIFY2(file.remove(filePath), qPrintable(file.errorString()));
}
}
@@ -377,12 +325,21 @@ void tst_QTranslator::dependencies()
{
QTranslator tor( 0 );
QFile file("dependencies_la.qm");
- file.open(QFile::ReadOnly);
+ QVERIFY(file.open(QFile::ReadOnly));
QByteArray data = file.readAll();
QVERIFY(tor.load((const uchar *)data.constData(), data.length()));
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
@@ -422,9 +379,9 @@ void tst_QTranslator::translationInThreadWhileInstallingTranslator()
thread.runningCondition.wait(&thread.startupLock);
- QTranslator *tor = new QTranslator;
- QVERIFY(tor->load("hellotr_la"));
- QCoreApplication::installTranslator(tor);
+ QTranslator tor;
+ QVERIFY(tor.load("hellotr_la"));
+ QVERIFY(QCoreApplication::installTranslator(&tor));
++thread.terminate;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 01:43:45 +0000