summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-04-17 16:25:25 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-04-28 11:56:44 +0300
commit550186ed78a023374239c1f8494188db030f035d (patch)
tree2d96ab24f87535bf42e746970679217777571acc /tests
parent4f5eace163eeb34504cb8044c42b147df03fafed (diff)
Add possibility to accept licenses from CLI
License agreements can be accepted automatically by using command line option --accept-licenses or interactively by answering queries with either "Accept", "Reject" or "Show" selections. Task-number: QTIFW-1742 Task-number: QTIFW-1745 Change-Id: Iff46b44f91faddb7f163b299994167ab16df68b3 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/installer/installer.pro3
-rw-r--r--tests/auto/installer/licenseagreement/data/repository/A/1.0.2-1meta.7zbin0 -> 11570 bytes
-rw-r--r--tests/auto/installer/licenseagreement/data/repository/Updates.xml16
-rw-r--r--tests/auto/installer/licenseagreement/licenseagreement.pro10
-rw-r--r--tests/auto/installer/licenseagreement/settings.qrc6
-rw-r--r--tests/auto/installer/licenseagreement/tst_licenseagreement.cpp72
6 files changed, 106 insertions, 1 deletions
diff --git a/tests/auto/installer/installer.pro b/tests/auto/installer/installer.pro
index ecba4f9bb..81def2f76 100644
--- a/tests/auto/installer/installer.pro
+++ b/tests/auto/installer/installer.pro
@@ -34,7 +34,8 @@ SUBDIRS += \
copydirectoryoperation \
commandlineupdate \
moveoperation \
- environmentvariableoperation
+ environmentvariableoperation \
+ licenseagreement
win32 {
SUBDIRS += registerfiletypeoperation \
diff --git a/tests/auto/installer/licenseagreement/data/repository/A/1.0.2-1meta.7z b/tests/auto/installer/licenseagreement/data/repository/A/1.0.2-1meta.7z
new file mode 100644
index 000000000..d473ac487
--- /dev/null
+++ b/tests/auto/installer/licenseagreement/data/repository/A/1.0.2-1meta.7z
Binary files differ
diff --git a/tests/auto/installer/licenseagreement/data/repository/Updates.xml b/tests/auto/installer/licenseagreement/data/repository/Updates.xml
new file mode 100644
index 000000000..2afd2a741
--- /dev/null
+++ b/tests/auto/installer/licenseagreement/data/repository/Updates.xml
@@ -0,0 +1,16 @@
+<Updates>
+ <ApplicationName>{AnyApplication}</ApplicationName>
+ <ApplicationVersion>1.0.0</ApplicationVersion>
+ <Checksum>false</Checksum>
+ <PackageUpdate>
+ <Name>A</Name>
+ <DisplayName>A</DisplayName>
+ <Description>Example component A</Description>
+ <Version>1.0.2-1</Version>
+ <ReleaseDate>2015-01-01</ReleaseDate>
+ <Default>true</Default>
+ <Licenses>
+ <License name="GNU GENERAL PUBLIC LICENSE Version 3" file="gpl3.txt"/>
+ </Licenses>
+ </PackageUpdate>
+</Updates>
diff --git a/tests/auto/installer/licenseagreement/licenseagreement.pro b/tests/auto/installer/licenseagreement/licenseagreement.pro
new file mode 100644
index 000000000..1d8c3c451
--- /dev/null
+++ b/tests/auto/installer/licenseagreement/licenseagreement.pro
@@ -0,0 +1,10 @@
+include(../../qttest.pri)
+
+QT -= gui
+QT += testlib
+
+SOURCES += tst_licenseagreement.cpp
+
+RESOURCES += \
+ settings.qrc \
+ ..\shared\config.qrc
diff --git a/tests/auto/installer/licenseagreement/settings.qrc b/tests/auto/installer/licenseagreement/settings.qrc
new file mode 100644
index 000000000..d030220ab
--- /dev/null
+++ b/tests/auto/installer/licenseagreement/settings.qrc
@@ -0,0 +1,6 @@
+<RCC>
+ <qresource prefix="/">
+ <file>data/repository/Updates.xml</file>
+ <file>data/repository/A/1.0.2-1meta.7z</file>
+ </qresource>
+</RCC>
diff --git a/tests/auto/installer/licenseagreement/tst_licenseagreement.cpp b/tests/auto/installer/licenseagreement/tst_licenseagreement.cpp
new file mode 100644
index 000000000..fad2faf0b
--- /dev/null
+++ b/tests/auto/installer/licenseagreement/tst_licenseagreement.cpp
@@ -0,0 +1,72 @@
+/**************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Installer Framework.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+**************************************************************************/
+
+#include <packagemanagercore.h>
+#include <binarycontent.h>
+#include <settings.h>
+#include <fileutils.h>
+#include <init.h>
+
+#include <QObject>
+#include <QFile>
+#include <QTest>
+
+using namespace KDUpdater;
+using namespace QInstaller;
+
+class tst_licenseagreement : public QObject
+{
+ Q_OBJECT
+
+private slots:
+ void testAutoAcceptFromCLI()
+ {
+ QInstaller::init(); //This will eat debug output
+ PackageManagerCore *core = new PackageManagerCore(BinaryContent::MagicInstallerMarker, QList<OperationBlob> ());
+ QSet<Repository> repoList;
+ Repository repo = Repository::fromUserInput(":///data/repository");
+ repoList.insert(repo);
+ core->settings().setDefaultRepositories(repoList);
+
+ QString installDir = QInstaller::generateTemporaryFileName();
+ QDir().mkpath(installDir);
+ core->setValue(scTargetDir, installDir);
+ core->setAutoAcceptLicenses();
+ core->installDefaultComponentsSilently();
+
+ QFile file(installDir + "/Licenses/gpl3.txt");
+ QVERIFY(file.exists());
+ QDir dir(installDir);
+ QVERIFY(dir.removeRecursively());
+ core->deleteLater();
+ }
+};
+
+QTEST_MAIN(tst_licenseagreement)
+
+#include "tst_licenseagreement.moc"