From 2ce1d0963f0c1b4139709802a82df30e2975d199 Mon Sep 17 00:00:00 2001
From: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Date: Tue, 2 Nov 2021 12:10:33 +0200
Subject: Add Extract operation tests for new archive formats

Change-Id: I63f80301f452d3d83384fb2c7b3039b43b9d61fe
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
---
 .../installer/extractarchiveoperationtest/data.qrc    |   4 ++++
 .../xmloperationrepository/A/1.0.0content1.tar.gz     | Bin 0 -> 105 bytes
 .../xmloperationrepository/A/1.0.0content2.tar.bz2    | Bin 0 -> 125 bytes
 .../xmloperationrepository/A/1.0.0content3.tar.xz     | Bin 0 -> 152 bytes
 .../data/xmloperationrepository/A/1.0.0content4.zip   | Bin 0 -> 202 bytes
 .../data/xmloperationrepository/Updates.xml           |  18 +++++++++++++++++-
 .../tst_extractarchiveoperationtest.cpp               |  12 ++++++++++++
 7 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content1.tar.gz
 create mode 100644 tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content2.tar.bz2
 create mode 100644 tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content3.tar.xz
 create mode 100644 tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content4.zip

(limited to 'tests')

diff --git a/tests/auto/installer/extractarchiveoperationtest/data.qrc b/tests/auto/installer/extractarchiveoperationtest/data.qrc
index d6eb2cf92..974c0c6f7 100644
--- a/tests/auto/installer/extractarchiveoperationtest/data.qrc
+++ b/tests/auto/installer/extractarchiveoperationtest/data.qrc
@@ -4,6 +4,10 @@
         <file>data/invalid.7z</file>
         <file>data/xmloperationrepository/Updates.xml</file>
         <file>data/xmloperationrepository/A/1.0.0content.7z</file>
+        <file>data/xmloperationrepository/A/1.0.0content1.tar.gz</file>
+        <file>data/xmloperationrepository/A/1.0.0content2.tar.bz2</file>
+        <file>data/xmloperationrepository/A/1.0.0content3.tar.xz</file>
+        <file>data/xmloperationrepository/A/1.0.0content4.zip</file>
         <file>data/xmloperationrepository/A/1.0.0anothercontent.7z</file>
         <file>data/xmloperationrepository/A/1.0.0default.7z</file>
     </qresource>
diff --git a/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content1.tar.gz b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content1.tar.gz
new file mode 100644
index 000000000..3e494db34
Binary files /dev/null and b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content1.tar.gz differ
diff --git a/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content2.tar.bz2 b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content2.tar.bz2
new file mode 100644
index 000000000..12cbef8a1
Binary files /dev/null and b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content2.tar.bz2 differ
diff --git a/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content3.tar.xz b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content3.tar.xz
new file mode 100644
index 000000000..bfa825493
Binary files /dev/null and b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content3.tar.xz differ
diff --git a/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content4.zip b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content4.zip
new file mode 100644
index 000000000..866bfa589
Binary files /dev/null and b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/A/1.0.0content4.zip differ
diff --git a/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/Updates.xml b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/Updates.xml
index 3a8bdd018..73a093725 100644
--- a/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/Updates.xml
+++ b/tests/auto/installer/extractarchiveoperationtest/data/xmloperationrepository/Updates.xml
@@ -8,7 +8,7 @@
   <Version>1.0.0</Version>
   <ReleaseDate>2015-01-01</ReleaseDate>
   <Default>true</Default>
-  <DownloadableArchives>content.7z,anothercontent.7z,default.7z</DownloadableArchives>
+  <DownloadableArchives>content.7z,anothercontent.7z,content1.tar.gz,content2.tar.bz2,content3.tar.xz,content4.zip,default.7z</DownloadableArchives>
   <Operations>
     <Operation name="Extract">
       <Argument>@TargetDir@/FolderForContent</Argument>
@@ -18,6 +18,22 @@
       <Argument>@TargetDir@/FolderForAnotherContent</Argument>
       <Argument>anothercontent.7z</Argument>
     </Operation>
+    <Operation name="Extract">
+      <Argument>@TargetDir@/FolderForTarGzContent</Argument>
+      <Argument>content1.tar.gz</Argument>
+    </Operation>
+    <Operation name="Extract">
+      <Argument>@TargetDir@/FolderForTarBz2Content</Argument>
+      <Argument>content2.tar.bz2</Argument>
+    </Operation>
+    <Operation name="Extract">
+      <Argument>@TargetDir@/FolderForTarXzContent</Argument>
+      <Argument>content3.tar.xz</Argument>
+    </Operation>
+    <Operation name="Extract">
+      <Argument>@TargetDir@/FolderForZipContent</Argument>
+      <Argument>content4.zip</Argument>
+    </Operation>
     <Operation name="Extract">
       <Argument>@TargetDir@/FolderForDefault</Argument>
     </Operation>
diff --git a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp
index cbbc1a1c7..14afc6902 100644
--- a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp
+++ b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp
@@ -100,6 +100,18 @@ private slots:
         QFile extractedFile(m_testDirectory + QDir::separator() + "FolderForContent/content.txt");
         QVERIFY(extractedFile.exists());
 
+        extractedFile.setFileName(m_testDirectory + QDir::separator() + "FolderForTarGzContent/content.txt");
+        QVERIFY(extractedFile.exists());
+
+        extractedFile.setFileName(m_testDirectory + QDir::separator() + "FolderForTarBz2Content/content.txt");
+        QVERIFY(extractedFile.exists());
+
+        extractedFile.setFileName(m_testDirectory + QDir::separator() + "FolderForTarXzContent/content.txt");
+        QVERIFY(extractedFile.exists());
+
+        extractedFile.setFileName(m_testDirectory + QDir::separator() + "FolderForZipContent/content.txt");
+        QVERIFY(extractedFile.exists());
+
         extractedFile.setFileName(m_testDirectory + QDir::separator() + "FolderForAnotherContent/anothercontent.txt");
         QVERIFY(extractedFile.exists());
 
-- 
cgit v1.2.3