diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/scriptengine/data/addOperation.qs | 52 | ||||
| -rw-r--r-- | tests/auto/installer/scriptengine/scriptengine.qrc | 1 | ||||
| -rw-r--r-- | tests/auto/installer/scriptengine/tst_scriptengine.cpp | 67 |
3 files changed, 0 insertions, 120 deletions
diff --git a/tests/auto/installer/scriptengine/data/addOperation.qs b/tests/auto/installer/scriptengine/data/addOperation.qs deleted file mode 100644 index d7d505a6b..000000000 --- a/tests/auto/installer/scriptengine/data/addOperation.qs +++ /dev/null @@ -1,52 +0,0 @@ -/************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Installer Framework. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -**************************************************************************/ - -function Component() -{ -} - -Component.prototype.createOperations = function () -{ - console.log("Component::createOperations()"); - component.createOperations(); - - component.addOperation("EmptyArg", "Arg", "Arg2", ""); - component.addOperation("EmptyArg", "Arg", "", "Arg3"); - component.addOperation("EmptyArg", "", "Arg2", "Arg3"); - component.addOperation("EmptyArg", ["Arg", "Arg2", ""]); - - component.addElevatedOperation("EmptyArg", "eArg", "eArg2", ""); - component.addElevatedOperation("EmptyArg", "eArg", "", "eArg3"); - component.addElevatedOperation("EmptyArg", "", "eArg2", "eArg3"); - component.addElevatedOperation("EmptyArg", ["eArg", "eArg2", ""]); -} diff --git a/tests/auto/installer/scriptengine/scriptengine.qrc b/tests/auto/installer/scriptengine/scriptengine.qrc index 9c72e686f..d630f3196 100644 --- a/tests/auto/installer/scriptengine/scriptengine.qrc +++ b/tests/auto/installer/scriptengine/scriptengine.qrc @@ -8,6 +8,5 @@ <file>data/enteringpage.qs</file> <file>data/form.ui</file> <file>data/userinterface.qs</file> - <file>data/addOperation.qs</file> </qresource> </RCC> diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp index d2e04b513..998e91523 100644 --- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp +++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp @@ -33,7 +33,6 @@ #include <component.h> #include <errors.h> -#include <kdupdaterupdateoperationfactory.h> #include <packagemanagercore.h> #include <packagemanagergui.h> #include <scriptengine.h> @@ -157,30 +156,6 @@ signals: void emitted(); }; -class EmptyArgOperation : public KDUpdater::UpdateOperation -{ -public: - EmptyArgOperation() { - setName("EmptyArg"); - } - - void backup() {} - bool performOperation() { - return true; - } - bool undoOperation() { - return true; - } - bool testOperation() { - return true; - } - UpdateOperation *clone() const { - return 0; - } -}; - - -// -- tst_ScriptEngine class tst_ScriptEngine : public QObject { @@ -197,10 +172,6 @@ private slots: m_component->setValue("Default", "Script"); m_component->setValue(scName, "component.test.name"); - Component *component = new Component(&m_core); - component->setValue(scName, "component.test.addOperation"); - m_core.appendRootComponent(component); - m_scriptEngine = m_core.componentScriptEngine(); } @@ -488,44 +459,6 @@ private slots: QCOMPARE(enteringPage->invocationOrder(), expectedOrder); } - void testAddOperation_AddElevatedOperation() - { - using namespace KDUpdater; - UpdateOperationFactory &factory = UpdateOperationFactory::instance(); - factory.registerUpdateOperation<EmptyArgOperation>(QLatin1String("EmptyArg")); - - try { - m_core.setPackageManager(); - Component *component = m_core.componentByName("component.test.addOperation"); - component->loadComponentScript(":///data/addOperation.qs"); - - setExpectedScriptOutput("\"Component::createOperations()\""); - component->createOperations(); - - const OperationList operations = component->operations(); - QCOMPARE(operations.count(), 8); - - struct { - const char* args[3]; - const char* operator[](int i) const { - return args[i]; - } - } expectedArgs[] = { - { "Arg", "Arg2", "" }, { "Arg", "", "Arg3" }, { "", "Arg2", "Arg3" }, { "Arg", "Arg2", "" }, - { "eArg", "eArg2", "" }, { "eArg", "", "eArg3" }, { "", "eArg2", "eArg3" }, { "eArg", "eArg2", "" } - }; - - for (int i = 0; i < operations.count(); ++i) { - const QStringList arguments = operations[i]->arguments(); - QCOMPARE(arguments.count(), 3); - for (int j = 0; j < 3; ++j) - QCOMPARE(arguments[j], QString(expectedArgs[i][j])); - } - } catch (const QInstaller::Error &error) { - QFAIL(qPrintable(error.message())); - } - } - private: void setExpectedScriptOutput(const char *message) { |