From e67fd518cbdf9c4ea99f88368f4c2b45e625c0c2 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Wed, 17 Feb 2016 10:49:51 +0000 Subject: Revert "Use QQmlV4Function to correctly get empty parameters from script." This reverts commit eb574d77b0ab9a92b61e7738d089cd4ea4304e51. The change will not work with Qt5.5 as it is causing constant crashes in Qt installers. Using this change will require a fix for Qt5. As we are about to make Qt installers based on 2.0 we need to revert this change for now. Change-Id: Ia7906d02db645f2407ab07d14f5a037224574b29 Reviewed-by: Andy Shaw --- .../installer/scriptengine/data/addOperation.qs | 52 ----------------- tests/auto/installer/scriptengine/scriptengine.qrc | 1 - .../installer/scriptengine/tst_scriptengine.cpp | 67 ---------------------- 3 files changed, 120 deletions(-) delete mode 100644 tests/auto/installer/scriptengine/data/addOperation.qs (limited to 'tests/auto/installer') 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 @@ data/enteringpage.qs data/form.ui data/userinterface.qs - data/addOperation.qs 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 #include -#include #include #include #include @@ -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(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) { -- cgit v1.2.3