CLI: Add error message for trying to install unstable components

Also print a general message when no components from the user selection
are valid - in case the installer misses the detailed reason why
components cannot be selected, at least some information is printed.

Task-number: QTIFW-2591
Change-Id: I1b10e7601527ddc0192417b41691691b517139a5
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

1 files changed, 10 insertions, 5 deletions

diff --git a/tests/auto/installer/cliinterface/tst_cliinterface.cpp b/tests/auto/installer/cliinterface/tst_cliinterface.cpp
index c87e0acc6..c43eca381 100644
--- a/tests/auto/installer/cliinterface/tst_cliinterface.cpp
+++ b/tests/auto/installer/cliinterface/tst_cliinterface.cpp
@@ -33,6 +33,7 @@
 
 #include <QLoggingCategory>
 #include <QTest>
+#include <QRegularExpression>
 
 #include <iostream>
 #include <sstream>
@@ -130,27 +131,31 @@ private slots:
         QLoggingCategory::setFilterRules(loggingRules);
 
         QTest::ignoreMessage(QtDebugMsg, "Preparing meta information download...");
-        QTest::ignoreMessage(QtDebugMsg, "Cannot install component A. Component is installed only as automatic dependency to autoDep.\n");
+        QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Cannot install component A. Component "
+            "is installed only as automatic dependency to autoDep.\n"));
         QCOMPARE(PackageManagerCore::Canceled, core->installSelectedComponentsSilently(QStringList()
                 << QLatin1String("A")));
 
         QTest::ignoreMessage(QtDebugMsg, "Preparing meta information download...");
-        QTest::ignoreMessage(QtDebugMsg, "Cannot install component AB. Component is not checkable, meaning you have to select one of the subcomponents.\n");
+        QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Cannot install component AB. Component "
+            "is not checkable, meaning you have to select one of the subcomponents.\n"));
         QCOMPARE(PackageManagerCore::Canceled, core->installSelectedComponentsSilently(QStringList()
                 << QLatin1String("AB")));
 
         QTest::ignoreMessage(QtDebugMsg, "Preparing meta information download...");
-        QTest::ignoreMessage(QtDebugMsg, "Cannot install B. Component is virtual.\n");
+        QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Cannot install B. Component is virtual.\n"));
         QCOMPARE(PackageManagerCore::Canceled, core->installSelectedComponentsSilently(QStringList()
                 << QLatin1String("B")));
 
         QTest::ignoreMessage(QtDebugMsg, "Preparing meta information download...");
-        QTest::ignoreMessage(QtDebugMsg, "Cannot install B.subcomponent. Component is a descendant of a virtual component B.\n");
+        QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Cannot install B.subcomponent. Component "
+            "is a descendant of a virtual component B.\n"));
         QCOMPARE(PackageManagerCore::Canceled, core->installSelectedComponentsSilently(QStringList()
                 << QLatin1String("B.subcomponent")));
 
         QTest::ignoreMessage(QtDebugMsg, "Preparing meta information download...");
-        QTest::ignoreMessage(QtDebugMsg, "Cannot install MissingComponent. Component not found.\n");
+        QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Cannot install MissingComponent. "
+            "Component not found.\n"));
         QCOMPARE(PackageManagerCore::Canceled, core->installSelectedComponentsSilently(QStringList()
                 << QLatin1String("MissingComponent")));
         QCOMPARE(PackageManagerCore::Canceled, core->status());