diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2022-05-12 09:47:27 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2022-05-12 10:14:38 +0300 |
| commit | b0a7fd03dcf64d41d74ea572e0bab49372589434 (patch) | |
| tree | 4e09ad33dbe146bf311fcf7d082e64273399f682 /tests/auto | |
| parent | a914cc8050a14a600cafd3f2716313c13adf4094 (diff) | |
Tests: Add detailed information about installer resource fails
Change-Id: Id6cac37c1c5cb760ea5303a4fdbf53cf02fcda0a
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/installer/shared/verifyinstaller.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/installer/shared/verifyinstaller.h b/tests/auto/installer/shared/verifyinstaller.h index 7cd2af05b..4d70c577b 100644 --- a/tests/auto/installer/shared/verifyinstaller.h +++ b/tests/auto/installer/shared/verifyinstaller.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -41,16 +41,17 @@ struct VerifyInstaller static void verifyInstallerResources(const QString &installDir, const QString &componentName, const QString &fileName) { QDir dir(installDir + QDir::separator() + "installerResources" + QDir::separator() + componentName); - QVERIFY(dir.exists()); + QVERIFY2(dir.exists(), qPrintable(QLatin1String("Directory: \"%1\" does not exist").arg(dir.absolutePath()))); QFileInfo fileInfo; fileInfo.setFile(dir, fileName); - QVERIFY(fileInfo.exists()); + QVERIFY2(fileInfo.exists(), qPrintable(QLatin1String("File: \"%1\" does not exist for \"%2\".") + .arg(fileName).arg(componentName))); } static void verifyInstallerResourcesDeletion(const QString &installDir, const QString &componentName) { QDir dir(installDir + QDir::separator() + "installerResources" + QDir::separator() + componentName); - QVERIFY(!dir.exists()); + QVERIFY2(!dir.exists(), qPrintable(QLatin1String("Directory: \"%1\" is not deleted.").arg(dir.absolutePath()))); } static void verifyInstallerResourceFileDeletion(const QString &installDir, const QString &componentName, const QString &fileName) @@ -58,7 +59,8 @@ struct VerifyInstaller QDir dir(installDir + QDir::separator() + "installerResources" + QDir::separator() + componentName); QFileInfo fileInfo; fileInfo.setFile(dir, fileName); - QVERIFY(!fileInfo.exists()); + QVERIFY2(!fileInfo.exists(), qPrintable(QLatin1String("File: \"%1\" still exists for \"%2\".") + .arg(fileName).arg(componentName))); } static void verifyFileExistence(const QString &installDir, const QStringList &fileList) |