From e90398e3be96c4380158d32d94b6dbc4b35397e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 13 Jul 2021 17:48:46 +0200 Subject: [PATCH] tst_qtranslator: Simplify extraction of test data This makes it easier to further extend the test. The overhead this causes is negligible. Change-Id: I42941879f55337268bb2914e122a5f573ab7e6f9 Reviewed-by: Oswald Buddenhagen (cherry picked from commit 841ce1f938219cb975099a28b720abeb95eea19d) Reviewed-by: Qt Cherry-pick Bot --- .../corelib/kernel/qtranslator/CMakeLists.txt | 2 ++ .../kernel/qtranslator/android_testdata.qrc | 8 ----- .../kernel/qtranslator/qtranslator.qrc | 6 ---- .../kernel/qtranslator/tst_qtranslator.cpp | 34 ++----------------- 4 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 tests/auto/corelib/kernel/qtranslator/android_testdata.qrc delete mode 100644 tests/auto/corelib/kernel/qtranslator/qtranslator.qrc diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt index e6dc1454724..1c7de81d719 100644 --- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt @@ -11,8 +11,10 @@ qt_internal_add_test(tst_qtranslator # Resources: set(qtranslator_resource_files + "dependencies_la.qm" "hellotr_empty.qm" "hellotr_la.qm" + "msgfmt_from_po.qm" ) qt_internal_add_resource(tst_qtranslator "qtranslator" diff --git a/tests/auto/corelib/kernel/qtranslator/android_testdata.qrc b/tests/auto/corelib/kernel/qtranslator/android_testdata.qrc deleted file mode 100644 index 39b85db6648..00000000000 --- a/tests/auto/corelib/kernel/qtranslator/android_testdata.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - hellotr_la.qm - hellotr_empty.qm - msgfmt_from_po.qm - dependencies_la.qm - - diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.qrc b/tests/auto/corelib/kernel/qtranslator/qtranslator.qrc deleted file mode 100644 index cb82c6cc958..00000000000 --- a/tests/auto/corelib/kernel/qtranslator/qtranslator.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - hellotr_la.qm - hellotr_empty.qm - - diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp index 3e7790d6ac3..ef84dfd07e6 100644 --- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp +++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp @@ -73,38 +73,10 @@ 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 - + QVERIFY2(QDir::setCurrent(dataDir->path()), + qPrintable("Could not chdir to " + dataDir->path())); } bool tst_QTranslator::eventFilter(QObject *, QEvent *event)