1 files changed, 100 insertions, 5 deletions

diff --git a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp
index baaf58da2..a8a65e983 100644
--- a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp
+++ b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -28,6 +28,7 @@
 
 #include "../shared/packagemanager.h"
 
+#include "concurrentoperationrunner.h"
 #include "init.h"
 #include "extractarchiveoperation.h"
 
@@ -84,8 +85,57 @@ private slots:
         QVERIFY(op.undoOperation());
 
         QCOMPARE(UpdateOperation::Error(op.error()), UpdateOperation::UserDefinedError);
-        QCOMPARE(op.errorString(), QString("Error while extracting archive \":///data/invalid.7z\": "
-                                           "Cannot open archive \":///data/invalid.7z\"."));
+    }
+
+    void testConcurrentExtractWithCompetingData()
+    {
+        // Suppress warnings about already deleted installerResources file
+        qInstallMessageHandler(silentTestMessageHandler);
+
+        const QString testDirectory = generateTemporaryFileName()
+            + "/subdir1/subdir2/subdir3/subdir4/subdir5/";
+
+        QStringList created7zList;
+
+        OperationList operations;
+        for (int i = 0; i < 100; ++i) {
+            ExtractArchiveOperation *op = new ExtractArchiveOperation(nullptr);
+            // We add the same data multiple times, and extract to same directory.
+            // Can't open the same archive multiple times however so it needs to
+            // be copied to unique files.
+            const QString new7zPath = generateTemporaryFileName() + ".7z";
+            QFile old7z(":///data/subdirs.7z");
+            QVERIFY(old7z.copy(new7zPath));
+
+            op->setArguments(QStringList() << new7zPath << testDirectory);
+            operations.append(op);
+        }
+        ConcurrentOperationRunner runner(&operations, Operation::Backup);
+
+        const QHash<Operation *, bool> backupResults = runner.run();
+        const OperationList backupOperations = backupResults.keys();
+
+        for (auto *operation : backupOperations)
+            QVERIFY2((backupResults.value(operation) && operation->error() == Operation::NoError),
+                     operation->errorString().toLatin1());
+
+        runner.setType(Operation::Perform);
+        const QHash<Operation *, bool> results = runner.run();
+        const OperationList performedOperations = results.keys();
+
+        for (auto *operation : performedOperations)
+            QVERIFY2((results.value(operation) && operation->error() == Operation::NoError),
+                     operation->errorString().toLatin1());
+
+        for (auto *operation : operations)
+            QVERIFY(operation->undoOperation());
+
+        qDeleteAll(operations);
+
+        for (const QString &archive : created7zList)
+            QFile::remove(archive);
+
+        QDir().rmdir(testDirectory);
     }
 
     void testExtractArchiveFromXML()
@@ -94,13 +144,25 @@ private slots:
         QVERIFY(QDir().mkpath(m_testDirectory));
         QVERIFY(QDir(m_testDirectory).exists());
 
-        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
-                (m_testDirectory, ":///data/xmloperationrepository");
+        QScopedPointer<PackageManagerCore> core(PackageManager::getPackageManagerWithInit
+                (m_testDirectory, ":///data/xmloperationrepository"));
         core->installDefaultComponentsSilently();
 
         QFile extractedFile(m_testDirectory + QDir::separator() + "FolderForContent/content.txt");
         QVERIFY(extractedFile.exists());
+#ifdef IFW_LIBARCHIVE
+        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());
+#endif
         extractedFile.setFileName(m_testDirectory + QDir::separator() + "FolderForAnotherContent/anothercontent.txt");
         QVERIFY(extractedFile.exists());
 
@@ -115,6 +177,39 @@ private slots:
         QVERIFY(dir.removeRecursively());
     }
 
+    void testInstallerBaseBinaryExtraction()
+    {
+        m_testDirectory = QInstaller::generateTemporaryFileName();
+        QVERIFY(QDir().mkpath(m_testDirectory));
+        QVERIFY(QDir(m_testDirectory).exists());
+
+        QScopedPointer<PackageManagerCore> core(PackageManager::getPackageManagerWithInit
+                                                (m_testDirectory, ":///data/installerbaserepository"));
+        core->setInstallerBaseBinary(m_testDirectory + QDir::separator() + "testInstallerBase.txt");
+        core->installDefaultComponentsSilently();
+
+        QFile contentResourceFile(m_testDirectory + QDir::separator() + "installerResources" + QDir::separator() + "A" + QDir::separator() + "1.0.0content.txt");
+        QVERIFY2(contentResourceFile.open(QIODevice::ReadOnly | QIODevice::Text), "Could not open content resource file for reading.");
+        QTextStream fileStream(&contentResourceFile);
+        QString line = fileStream.readLine();
+        QVERIFY2(!line.isEmpty(), "Content not written to resource file.");
+        contentResourceFile.close();
+
+        QFile installerBaseResourceFile(m_testDirectory + QDir::separator() + "installerResources" + QDir::separator() + "A" + QDir::separator() + "1.0.0installerbase.txt");
+        QVERIFY2(installerBaseResourceFile.open(QIODevice::ReadOnly | QIODevice::Text),  "Could not open installerbase resource file for reading.");
+        QTextStream fileStream2(&installerBaseResourceFile);
+        line = installerBaseResourceFile.readLine();
+        QVERIFY2(line.isEmpty(), "Installerbase falsly written to resource file.");
+        installerBaseResourceFile.close();
+
+        core->setPackageManager();
+        core->commitSessionOperations();
+
+        QCOMPARE(PackageManagerCore::Success, core->uninstallComponentsSilently(QStringList() << "A"));
+        QDir dir(m_testDirectory);
+        QVERIFY(dir.removeRecursively());
+    }
+
 private:
     QString m_testDirectory;
 };