diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2022-11-28 13:30:21 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2022-11-30 15:03:46 +0200 |
| commit | 51e02b08abb44131929dba2d86860d10ca17cf41 (patch) | |
| tree | c74ea513a2385f430c8a2491fcdebf08e39c2937 /tests/auto | |
| parent | f02c3a2f2a6a5db84a947ca6d4f4ab5f5d867d41 (diff) | |
Cleanup installer calculator classes
As there are several optimizations done, the single click of component
in component selection tree is not slow anymore. Cleaning the code so
it is easier to maintain.
Basically this revers commit a28cf55b5a5007c0dd952b3012c076d9da329f0f
but as there are bug fixes made after that so pure revert could not
be done.
Task-number: QTIFW-2885
Change-Id: Id486d5dc68c42c31b4848cd19a1761bcfe242db6
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/installer/solver/tst_solver.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/auto/installer/solver/tst_solver.cpp b/tests/auto/installer/solver/tst_solver.cpp index bdfc4d3df..ee05cc7f4 100644 --- a/tests/auto/installer/solver/tst_solver.cpp +++ b/tests/auto/installer/solver/tst_solver.cpp @@ -248,7 +248,6 @@ private slots: { QTest::addColumn<PackageManagerCore *>("core"); QTest::addColumn<QList<Component *> >("selectedToUninstall"); - QTest::addColumn<QList<Component *> >("installedComponents"); QTest::addColumn<QSet<Component *> >("expectedResult"); QTest::addColumn<UninstallReasonList >("uninstallReasons"); QTest::addColumn<LocalDependencyHash >("dependencyHash"); @@ -277,7 +276,6 @@ private slots: uninstallReasonList.append(qMakePair(componentB, UninstallerCalculator::Dependent)); QTest::newRow("Uninstaller resolved") << core << (QList<Component *>() << componentAB) - << (QList<Component *>() << componentA << componentB) << (QSet<Component *>() << componentAB << componentB) << uninstallReasonList << dependencyComponentHash; @@ -303,7 +301,6 @@ private slots: uninstallReasonList.append(qMakePair(compB, UninstallerCalculator::Dependent)); QTest::newRow("Cascade dependencies") << core << (QList<Component *>() << compA) - << (QList<Component *>() << compB) << (QSet<Component *>() << compA << compB) << (uninstallReasonList) << dependencyComponentHash; @@ -313,12 +310,11 @@ private slots: { QFETCH(PackageManagerCore *, core); QFETCH(QList<Component *> , selectedToUninstall); - QFETCH(QList<Component *> , installedComponents); QFETCH(QSet<Component *> , expectedResult); QFETCH(UninstallReasonList, uninstallReasons); QFETCH(LocalDependencyHash, dependencyHash); - UninstallerCalculator calc(installedComponents, core, QHash<QString, QStringList>(), dependencyHash, QStringList()); + UninstallerCalculator calc(core, QHash<QString, QStringList>(), dependencyHash, QStringList()); calc.appendComponentsToUninstall(selectedToUninstall); QSet<Component *> result = calc.componentsToUninstall(); for (auto pair : uninstallReasons) { |