diff options
author | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-02-17 10:49:51 +0000 |
---|---|---|
committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-02-17 11:20:56 +0000 |
commit | e67fd518cbdf9c4ea99f88368f4c2b45e625c0c2 (patch) | |
tree | 80d6756a059edf8e92aabc6dd391ac7f425cca58 /tests/auto/installer/scriptengine/tst_scriptengine.cpp | |
parent | 9d4be1a53be2b643114d051332d8439bc8809e59 (diff) |
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 <andy.shaw@theqtcompany.com>
Diffstat (limited to 'tests/auto/installer/scriptengine/tst_scriptengine.cpp')
-rw-r--r-- | tests/auto/installer/scriptengine/tst_scriptengine.cpp | 67 |
1 files changed, 0 insertions, 67 deletions
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) { |