Fix arguments in RegisterFileType

When using RegisterFileType, argumens include progId.
Removed it from arguments and saved as member variable.
This way progId won't interfere argument check count and
it can be used also in undo operation.

Change-Id: Ic80a54a28b5e171a5d4e3023b58eb1636a16fa49
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

5 files changed, 175 insertions, 22 deletions

diff --git a/src/libs/installer/registerfiletypeoperation.cpp b/src/libs/installer/registerfiletypeoperation.cpp
index 89d1934c3..bce1db239 100644
--- a/src/libs/installer/registerfiletypeoperation.cpp
+++ b/src/libs/installer/registerfiletypeoperation.cpp
@@ -81,6 +81,7 @@ static QVariantHash readHive(QSettingsWrapper *const settings, const QString &hi
 
 RegisterFileTypeOperation::RegisterFileTypeOperation(PackageManagerCore *core)
     : UpdateOperation(core)
+    , m_optionalArgumentsRead(false)
 {
     setName(QLatin1String("RegisterFileType"));
 }
@@ -92,11 +93,10 @@ void RegisterFileTypeOperation::backup()
 bool RegisterFileTypeOperation::performOperation()
 {
 #ifdef Q_OS_WIN
-    QStringList args = arguments();
-    QString progId = takeProgIdArgument(args);
-
+    ensureOptionalArgumentsRead();
     if (!checkArgumentCount(2, 5, tr("<extension> <command> [description [contentType [icon]]]")))
         return false;
+    QStringList args = arguments();
 
     bool allUsers = false;
     PackageManagerCore *const core = packageManager();
@@ -106,19 +106,16 @@ bool RegisterFileTypeOperation::performOperation()
     QSettingsWrapper settings(QLatin1String(allUsers ? "HKEY_LOCAL_MACHINE" : "HKEY_CURRENT_USER")
         , QSettingsWrapper::NativeFormat);
 
-    const QString extension = args.at(0);
-    if (progId.isEmpty())
-        progId = QString::fromLatin1("%1_auto_file").arg(extension);
-    const QString classesProgId = QString::fromLatin1("Software/Classes/") + progId;
-    const QString classesFileType = QString::fromLatin1("Software/Classes/.%2").arg(extension);
-    const QString classesApplications = QString::fromLatin1("Software/Classes/Applications/") + progId;
+    const QString classesProgId = QString::fromLatin1("Software/Classes/") + m_progId;
+    const QString classesFileType = QString::fromLatin1("Software/Classes/.%2").arg(args.at(0));
+    const QString classesApplications = QString::fromLatin1("Software/Classes/Applications/") + m_progId;
 
     // backup old value
     setValue(QLatin1String("oldType"), readHive(&settings, classesFileType));
 
     // register new values
-    settings.setValue(QString::fromLatin1("%1/Default").arg(classesFileType), progId);
-    settings.setValue(QString::fromLatin1("%1/OpenWithProgIds/%2").arg(classesFileType, progId), QString());
+    settings.setValue(QString::fromLatin1("%1/Default").arg(classesFileType), m_progId);
+    settings.setValue(QString::fromLatin1("%1/OpenWithProgIds/%2").arg(classesFileType, m_progId), QString());
     settings.setValue(QString::fromLatin1("%1/shell/Open/Command/Default").arg(classesProgId), args.at(1));
     settings.setValue(QString::fromLatin1("%1/shell/Open/Command/Default").arg(classesApplications), args.at(1));
 
@@ -154,13 +151,11 @@ bool RegisterFileTypeOperation::performOperation()
 bool RegisterFileTypeOperation::undoOperation()
 {
 #ifdef Q_OS_WIN
+    ensureOptionalArgumentsRead();
     QStringList args = arguments();
-    QString progId = takeProgIdArgument(args);
 
-    if (args.count() < 2 || args.count() > 5) {
-        setErrorString(tr("Register File Type: Invalid arguments"));
+    if (!checkArgumentCount(2, 5, tr("Register File Type: Invalid arguments")))
         return false;
-    }
 
     bool allUsers = false;
     PackageManagerCore *const core = packageManager();
@@ -170,12 +165,9 @@ bool RegisterFileTypeOperation::undoOperation()
     QSettingsWrapper settings(QLatin1String(allUsers ? "HKEY_LOCAL_MACHINE" : "HKEY_CURRENT_USER")
         , QSettingsWrapper::NativeFormat);
 
-    const QString extension = args.at(0);
-    if (progId.isEmpty())
-        progId = QString::fromLatin1("%1_auto_file").arg(extension);
-    const QString classesProgId = QString::fromLatin1("Software/Classes/") + progId;
-    const QString classesFileType = QString::fromLatin1("Software/Classes/.%2").arg(extension);
-    const QString classesApplications = QString::fromLatin1("Software/Classes/Applications/") + progId;
+    const QString classesProgId = QString::fromLatin1("Software/Classes/") + m_progId;
+    const QString classesFileType = QString::fromLatin1("Software/Classes/.%2").arg(args.at(0));
+    const QString classesApplications = QString::fromLatin1("Software/Classes/Applications/") + m_progId;
 
     // Quoting MSDN here: When uninstalling an application, the ProgIDs and most other registry information
     // associated with that application should be deleted as part of the uninstallation.However, applications
@@ -197,7 +189,7 @@ bool RegisterFileTypeOperation::undoOperation()
         settings.endGroup();
     } else {
         // some changes happened, remove the only save value we know about
-        settings.remove(QString::fromLatin1("%1/OpenWithProgIds/%2").arg(classesFileType, progId));
+        settings.remove(QString::fromLatin1("%1/OpenWithProgIds/%2").arg(classesFileType, m_progId));
     }
 
     // remove ProgId and Applications entry
@@ -218,3 +210,22 @@ bool RegisterFileTypeOperation::testOperation()
 {
     return true;
 }
+
+void RegisterFileTypeOperation::ensureOptionalArgumentsRead()
+{
+#ifdef Q_OS_WIN
+    if (m_optionalArgumentsRead)
+        return;
+
+    m_optionalArgumentsRead = true;
+
+    QStringList args = arguments();
+
+    m_progId = takeProgIdArgument(args);
+
+    if (m_progId.isEmpty() && args.count() > 0)
+        m_progId = QString::fromLatin1("%1_auto_file").arg(args.at(0));
+
+    setArguments(args);
+#endif
+}
diff --git a/src/libs/installer/registerfiletypeoperation.h b/src/libs/installer/registerfiletypeoperation.h
index 0c50ab02b..e427b5aaa 100644
--- a/src/libs/installer/registerfiletypeoperation.h
+++ b/src/libs/installer/registerfiletypeoperation.h
@@ -49,6 +49,12 @@ public:
     bool performOperation();
     bool undoOperation();
     bool testOperation();
+
+private:
+    void ensureOptionalArgumentsRead();
+
+    bool m_optionalArgumentsRead;
+    QString m_progId;
 };
 
 }
diff --git a/tests/auto/installer/installer.pro b/tests/auto/installer/installer.pro
index dfdb23995..7f18fa4d1 100644
--- a/tests/auto/installer/installer.pro
+++ b/tests/auto/installer/installer.pro
@@ -19,3 +19,7 @@ SUBDIRS += \
     task \
     clientserver \
     factory
+
+win32 {
+    SUBDIRS += registerfiletypeoperation
+}
diff --git a/tests/auto/installer/registerfiletypeoperation/registerfiletypeoperation.pro b/tests/auto/installer/registerfiletypeoperation/registerfiletypeoperation.pro
new file mode 100644
index 000000000..b98cebed3
--- /dev/null
+++ b/tests/auto/installer/registerfiletypeoperation/registerfiletypeoperation.pro
@@ -0,0 +1,6 @@
+include(../../qttest.pri)
+
+QT -= gui
+QT += testlib
+
+SOURCES = tst_registerfiletypeoperation.cpp
diff --git a/tests/auto/installer/registerfiletypeoperation/tst_registerfiletypeoperation.cpp b/tests/auto/installer/registerfiletypeoperation/tst_registerfiletypeoperation.cpp
new file mode 100644
index 000000000..7afc372b4
--- /dev/null
+++ b/tests/auto/installer/registerfiletypeoperation/tst_registerfiletypeoperation.cpp
@@ -0,0 +1,126 @@
+/**************************************************************************
+**
+** 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$
+**
+**************************************************************************/
+
+#include "init.h"
+#include "registerfiletypeoperation.h"
+#include "packagemanagercore.h"
+
+#include <QDir>
+#include <QObject>
+#include <QTest>
+#include <QFile>
+#include <QTextStream>
+#include <QSettings>
+#include "qsettingswrapper.h"
+
+using namespace KDUpdater;
+using namespace QInstaller;
+
+class tst_registerfiletypeoperation : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase()
+    {
+        QInstaller::init();
+        QString randomString = "";
+        const QString possible = "abcdefghijklmnopqrstuvwxyz0123456789";
+        qsrand(QTime::currentTime().msec());
+        for (int i = 0; i < 5; i++) {
+            int index = qrand() % possible.length();
+            QChar nextChar = possible.at(index);
+            randomString.append(nextChar);
+
+        }
+        m_fileType = randomString;
+
+        m_command = m_core.environmentVariable("SystemRoot") + "\\notepad.exe";
+        m_progId = "QtProject.QtInstallerFramework." + m_fileType;
+
+    }
+
+    void testMissingArguments()
+    {
+        RegisterFileTypeOperation op(&m_core);
+
+        QVERIFY(op.testOperation());
+        QVERIFY(!op.performOperation());
+
+        QCOMPARE(UpdateOperation::Error(op.error()), UpdateOperation::InvalidArguments);
+        QCOMPARE(op.errorString(), QString("Invalid arguments in RegisterFileType: 0 arguments given, "
+                                      "2 to 5 arguments expected in the form: <extension> <command> [description [contentType [icon]]]."));
+
+    }
+    void testRegisterFileType()
+    {
+        RegisterFileTypeOperation op(&m_core);
+        op.setArguments(QStringList() << m_fileType << m_command << "test filetype" <<
+                                       "text/plain" << 0 << "ProgId="+m_progId);
+
+        const QString settingsPath = QString::fromLatin1("HKEY_CURRENT_USER\\Software\\Classes\\");
+        QSettings settings(settingsPath, QSettings::NativeFormat);
+
+
+        QVERIFY(op.testOperation());
+        QVERIFY(op.performOperation());
+
+        QString defaultKey = "."+m_fileType+ "/Default";
+        QString openWithProgIdkey = "." + m_fileType + "/OpenWithProgIds/" +m_progId;
+        QString shellKey = m_progId + "/shell/Open/Command/Default/";
+        QString shellAppkey = "/Applications/" + m_progId + "/shell/Open/Command/Default/";
+
+        QCOMPARE(settings.value(defaultKey).toString(), m_progId);
+        QCOMPARE(settings.value(openWithProgIdkey).toString(), QString());
+        QCOMPARE(settings.value(shellKey).toString(), m_command);
+        QCOMPARE(settings.value(shellAppkey).toString(), m_command);
+
+        QVERIFY(op.undoOperation());
+
+        //Test that values have been removed after undo operation
+        QCOMPARE(settings.value(defaultKey).toString(), QString());
+        QCOMPARE(settings.value(openWithProgIdkey).toString(), QString());
+        QCOMPARE(settings.value(shellKey).toString(), QString());
+        QCOMPARE(settings.value(shellAppkey).toString(), QString());
+    }
+
+private:
+    QString m_fileType;
+    QString m_command;
+    QString m_progId;
+    PackageManagerCore m_core;
+};
+
+QTEST_MAIN(tst_registerfiletypeoperation)
+
+#include "tst_registerfiletypeoperation.moc"