Repogen: allow usage of --update-new-components with unified metadata

I couldn't find a reason why this combination wouldn't work. If there
are no known issues the option should be allowed.

Task-number: QTIFW-2558
Change-Id: I9bceddc70e3ea4edeb1af2fe873f96bf815900d3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

1 files changed, 39 insertions, 1 deletions

diff --git a/tests/auto/tools/repotest/tst_repotest.cpp b/tests/auto/tools/repotest/tst_repotest.cpp
index 0fb6f9cd3..f27acfe89 100644
--- a/tests/auto/tools/repotest/tst_repotest.cpp
+++ b/tests/auto/tools/repotest/tst_repotest.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 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.
@@ -359,6 +359,44 @@ private slots:
         verifyComponentMetaUpdatesXml();
     }
 
+    void testUpdateNewComponentsWithUniteMetadata()
+    {
+        ignoreMessagesForComponentSha(QStringList() << "A" << "B", false);
+        ignoreMessagesForUniteMeta(false);
+        generateRepo(true, true, false);
+        verifyComponentRepository("1.0.0", "1.0.0", true);
+
+        initRepoUpdate();
+        ignoreMessageForCollectingPackages("2.0.0", "1.0.0");
+        ignoreMessagesForComponentSha(QStringList() << "A", false); //Only A has update
+        ignoreMessagesForComponentHash(QStringList() << "A");
+        ignoreMessagesForCopyMetadata("A", true, true);
+        ignoreMessagesForUniteMeta(true);
+        const QString &message = "Update component \"A\" in \"%1\" .";
+        QTest::ignoreMessage(QtDebugMsg, qPrintable(message.arg(m_repoInfo.repositoryDir)));
+        generateRepo(true, true, true);
+        verifyComponentRepository("2.0.0", "1.0.0", true);
+        verifyUniteMetadata("2.0.0");
+    }
+
+    void testUpdateNewComponentsWithOnlyUniteMetadata()
+    {
+        ignoreMessagesForUniteMeta(false);
+        generateRepo(false, true, false);
+        verifyComponentRepository("1.0.0", "1.0.0", false);
+
+        initRepoUpdate();
+        ignoreMessageForCollectingPackages("2.0.0", "1.0.0");
+        ignoreMessagesForComponentHash(QStringList() << "A");
+        ignoreMessagesForCopyMetadata("A", true, true);
+        ignoreMessagesForUniteMeta(true);
+        const QString &message = "Update component \"A\" in \"%1\" .";
+        QTest::ignoreMessage(QtDebugMsg, qPrintable(message.arg(m_repoInfo.repositoryDir)));
+        generateRepo(false, true, true);
+        verifyComponentRepository("2.0.0", "1.0.0", false);
+        verifyUniteMetadata("2.0.0");
+    }
+
     void testUpdateComponents()
     {
         ignoreMessagesForComponentSha(QStringList() << "A" << "B", false);