diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-04-01 10:34:29 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-04-02 13:18:25 +0300 |
commit | 29c465ba7078ab9b1810076739631c35a0198027 (patch) | |
tree | 47db7a4af22364249a90ea4b8cfcbe9d685d1ebd | |
parent | 8370a30a7cb7d5445bc6fc184141cfcbebc46cb6 (diff) |
Tests: Remove unused parameter
Change-Id: I533a4ab2591e13abceab371a943adf9cf1781d61
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r-- | tests/auto/installer/cliinterface/tst_cliinterface.cpp | 14 | ||||
-rw-r--r-- | tests/auto/installer/shared/commonfunctions.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/installer/cliinterface/tst_cliinterface.cpp b/tests/auto/installer/cliinterface/tst_cliinterface.cpp index 70305a647..527d8295e 100644 --- a/tests/auto/installer/cliinterface/tst_cliinterface.cpp +++ b/tests/auto/installer/cliinterface/tst_cliinterface.cpp @@ -201,8 +201,8 @@ private slots: core.setPackageManager(); core.uninstallComponentsSilently(QStringList() << QLatin1String("componentA")); VerifyInstaller::verifyInstallerResources(m_installDir, "componentE", "1.0.0content.txt"); //ForcedInstall - VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentA", "1.0.0content.txt"); - VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentG", "1.0.0content.txt"); //Depends on componentA + VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentA"); + VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentG"); //Depends on componentA VerifyInstaller::verifyFileExistence(m_installDir, QStringList() << "components.xml" << "installcontentE.txt"); } @@ -238,7 +238,7 @@ private slots: VerifyInstaller::verifyInstallerResources(m_installDir, "componentE", "1.0.0content.txt"); //ForcedInstall VerifyInstaller::verifyInstallerResources(m_installDir, "componentG", "1.0.0content.txt"); //Depends on componentA VerifyInstaller::verifyInstallerResources(m_installDir, "componentD", "1.0.0content.txt"); //Autodepend on componentA and componentB - VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentC", "1.0.0content.txt"); + VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentC"); VerifyInstaller::verifyFileExistence(m_installDir, QStringList() << "components.xml" << "installcontent.txt" << "installcontentA.txt" << "installcontentB.txt" << "installcontentD.txt"<< "installcontentE.txt" << "installcontentG.txt"); @@ -276,9 +276,9 @@ private slots: VerifyInstaller::verifyInstallerResources(m_installDir, "componentA", "1.0.0content.txt"); //Dependency for componentG VerifyInstaller::verifyInstallerResources(m_installDir, "componentE", "1.0.0content.txt"); //ForcedInstall VerifyInstaller::verifyInstallerResources(m_installDir, "componentG", "1.0.0content.txt"); //Default install - VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentF.subcomponent2.subsubcomponent2", "1.0.0content.txt"); - VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentF.subcomponent2", "1.0.0content.txt"); - VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentF", "1.0.0content.txt"); + VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentF.subcomponent2.subsubcomponent2"); + VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentF.subcomponent2"); + VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentF"); VerifyInstaller::verifyFileExistence(m_installDir, QStringList() << "components.xml" << "installcontent.txt" << "installcontentA.txt" << "installcontentE.txt" << "installcontentG.txt"); @@ -309,7 +309,7 @@ private slots: core.uninstallComponentsSilently(QStringList() << "componentG"); VerifyInstaller::verifyInstallerResources(m_installDir, "componentA", "1.0.0content.txt"); //Dependency for componentG VerifyInstaller::verifyInstallerResources(m_installDir, "componentE", "1.0.0content.txt"); //ForcedInstall - VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentG", "1.0.0content.txt"); + VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentG"); VerifyInstaller::verifyFileExistence(m_installDir, QStringList() << "components.xml" << "installcontent.txt" << "installcontentA.txt" << "installcontentE.txt"); } diff --git a/tests/auto/installer/shared/commonfunctions.h b/tests/auto/installer/shared/commonfunctions.h index 5e8e2304c..bf96c5648 100644 --- a/tests/auto/installer/shared/commonfunctions.h +++ b/tests/auto/installer/shared/commonfunctions.h @@ -45,7 +45,7 @@ struct VerifyInstaller QVERIFY(fileInfo.exists()); } - static void verifyInstallerResourcesDeletion(const QString &installDir, const QString &componentName, const QString &fileName) + static void verifyInstallerResourcesDeletion(const QString &installDir, const QString &componentName) { QDir dir(installDir + QDir::separator() + "installerResources" + QDir::separator() + componentName); QVERIFY(!dir.exists()); |