Use QQmlV4Function to correctly get empty parameters from script.

By using QQmlV4Function to get the parameters, empty strings passed
are correctly kept as empty and not null.

Task-number: QTIFW-724
Change-Id: I592e2230e574ba82e765bd0079964db29452b2e9
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

3 files changed, 121 insertions, 0 deletions

diff --git a/tests/auto/installer/scriptengine/data/addOperation.qs b/tests/auto/installer/scriptengine/data/addOperation.qs
new file mode 100644
index 000000000..9be112aaf
--- /dev/null
+++ b/tests/auto/installer/scriptengine/data/addOperation.qs
@@ -0,0 +1,53 @@
+/**************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Installer Framework.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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://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 d630f3196..9c72e686f 100644
--- a/tests/auto/installer/scriptengine/scriptengine.qrc
+++ b/tests/auto/installer/scriptengine/scriptengine.qrc
@@ -8,5 +8,6 @@
         <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 0bbb79060..04a5e0b63 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -34,6 +34,7 @@
 
 #include <component.h>
 #include <errors.h>
+#include <kdupdaterupdateoperationfactory.h>
 #include <packagemanagercore.h>
 #include <packagemanagergui.h>
 #include <scriptengine.h>
@@ -157,6 +158,30 @@ 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
 {
@@ -173,6 +198,10 @@ 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();
     }
 
@@ -460,6 +489,44 @@ 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)
     {