From 6c8e635b25bec454e4cf6557ca727f89cb210f52 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Wed, 27 May 2020 11:56:34 +0300
Subject: Inform if trying to uninstall virtual component

Task-number: QTIFW-1811
Change-Id: I333d6d0bd93f8538919f172113b7039b63491492
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
---
 .../data/componentsFromInstallPackagesRepository.xml  |  11 +++++++++++
 .../data/installPackagesRepository/Updates.xml        |   9 +++++++++
 .../componentH/1.0.0content.7z                        | Bin 0 -> 209 bytes
 tests/auto/installer/cliinterface/settings.qrc        |   1 +
 .../auto/installer/cliinterface/tst_cliinterface.cpp  |  18 ++++++++++++++++++
 5 files changed, 39 insertions(+)
 create mode 100644 tests/auto/installer/cliinterface/data/installPackagesRepository/componentH/1.0.0content.7z

(limited to 'tests')

diff --git a/tests/auto/installer/cliinterface/data/componentsFromInstallPackagesRepository.xml b/tests/auto/installer/cliinterface/data/componentsFromInstallPackagesRepository.xml
index 2529d91bf..90d14c93e 100644
--- a/tests/auto/installer/cliinterface/data/componentsFromInstallPackagesRepository.xml
+++ b/tests/auto/installer/cliinterface/data/componentsFromInstallPackagesRepository.xml
@@ -134,4 +134,15 @@
         <Dependencies>componentA</Dependencies>
         <Checkable>true</Checkable>
     </Package>
+    <Package>
+        <Name>componentH</Name>
+        <Title>Component H</Title>
+        <Description>This component does not depend on any other component.</Description>
+        <Version>1.0.0</Version>
+        <LastUpdateDate></LastUpdateDate>
+        <InstallDate>2020-03-23</InstallDate>
+        <Size>99</Size>
+        <Virtual>true</Virtual>
+        <Checkable>true</Checkable>
+    </Package>
 </Packages>
diff --git a/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml b/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml
index 824a6e21f..736eb739a 100644
--- a/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml
+++ b/tests/auto/installer/cliinterface/data/installPackagesRepository/Updates.xml
@@ -150,4 +150,13 @@
   <DownloadableArchives>content.7z</DownloadableArchives>
   <SHA1>8cba36dd589492c28e0d04942b4f8aa0a09f59cc</SHA1>
  </PackageUpdate>
+ <PackageUpdate>
+  <Name>componentH</Name>
+  <Description>This component does not depend on any other component.</Description>
+  <Version>1.0.0</Version>
+  <ReleaseDate>2014-08-25</ReleaseDate>
+  <SortingPriority>50</SortingPriority>
+  <DownloadableArchives>content.7z</DownloadableArchives>
+  <Virtual>true</Virtual>
+ </PackageUpdate>
 </Updates>
diff --git a/tests/auto/installer/cliinterface/data/installPackagesRepository/componentH/1.0.0content.7z b/tests/auto/installer/cliinterface/data/installPackagesRepository/componentH/1.0.0content.7z
new file mode 100644
index 000000000..e1449ad29
Binary files /dev/null and b/tests/auto/installer/cliinterface/data/installPackagesRepository/componentH/1.0.0content.7z differ
diff --git a/tests/auto/installer/cliinterface/settings.qrc b/tests/auto/installer/cliinterface/settings.qrc
index be97adfbe..2278f42d0 100644
--- a/tests/auto/installer/cliinterface/settings.qrc
+++ b/tests/auto/installer/cliinterface/settings.qrc
@@ -12,6 +12,7 @@
         <file>data/installPackagesRepository/componentE/1.0.0content.7z</file>
         <file>data/installPackagesRepository/componentF/1.0.0content.7z</file>
         <file>data/installPackagesRepository/componentG/1.0.0content.7z</file>
+        <file>data/installPackagesRepository/componentH/1.0.0content.7z</file>
         <file>data/installPackagesRepository/componentG/1.0.0meta.7z</file>
         <file>data/installPackagesRepository/componentF.subcomponent1/1.0.0content.7z</file>
         <file>data/installPackagesRepository/componentF.subcomponent2/1.0.0content.7z</file>
diff --git a/tests/auto/installer/cliinterface/tst_cliinterface.cpp b/tests/auto/installer/cliinterface/tst_cliinterface.cpp
index ebf63ff9d..a9e58a656 100644
--- a/tests/auto/installer/cliinterface/tst_cliinterface.cpp
+++ b/tests/auto/installer/cliinterface/tst_cliinterface.cpp
@@ -133,6 +133,9 @@ private slots:
 
         QTest::ignoreMessage(QtWarningMsg, "Cannot uninstall component MissingComponent. Component not found in install tree.");
         core.uninstallComponentsSilently(QStringList() << "MissingComponent");
+
+        QTest::ignoreMessage(QtWarningMsg, "Cannot uninstall virtual component componentH");
+        core.uninstallComponentsSilently(QStringList() << "componentH");
     }
 
     void testListInstalledPackages()
@@ -351,6 +354,21 @@ private slots:
                             << "installcontentA.txt" << "installcontentE.txt" << "installcontentG.txt"
                             << "installcontentB.txt" << "installcontentD.txt");
     }
+
+    void testUninstallVirtualSetVisibleSilently()
+    {
+        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
+                (m_installDir, ":///data/installPackagesRepository");
+        core->setVirtualComponentsVisible(true);
+        core->installSelectedComponentsSilently(QStringList() <<"componentH");
+        VerifyInstaller::verifyInstallerResources(m_installDir, "componentH", "1.0.0content.txt");
+
+        core->commitSessionOperations();
+        core->setPackageManager();
+        core->uninstallComponentsSilently(QStringList() << "componentH");
+        VerifyInstaller::verifyInstallerResourcesDeletion(m_installDir, "componentH");
+    }
+
     void testFileQuery()
     {
         PackageManagerCore *core = PackageManager::getPackageManagerWithInit(m_installDir,
-- 
cgit v1.2.3