4 files changed, 127 insertions, 8 deletions

diff --git a/tests/auto/installer/binaryformat/binaryformat.pro b/tests/auto/installer/binaryformat/binaryformat.pro
new file mode 100644
index 000000000..24a7899ce
--- /dev/null
+++ b/tests/auto/installer/binaryformat/binaryformat.pro
@@ -0,0 +1,5 @@
+include(../../qttest.pri)
+
+QT -= gui
+
+SOURCES += tst_binaryformat.cpp
diff --git a/tests/auto/installer/binaryformat/tst_binaryformat.cpp b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
new file mode 100644
index 000000000..59f0e8e03
--- /dev/null
+++ b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
@@ -0,0 +1,115 @@
+/**************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+**************************************************************************/
+
+#include <binaryformat.h>
+#include <errors.h>
+#include <fileutils.h>
+
+#include <QTest>
+#include <QTemporaryFile>
+
+static const qint64 scTinySize = 72704LL;
+static const qint64 scSmallSize = 524288LL;
+static const qint64 scLargeSize = 2097152LL;
+
+class tst_BinaryFormat : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void findMagicCookieSmallFile()
+    {
+        QTemporaryFile file;
+        file.open();
+
+        try {
+            QInstaller::blockingWrite(&file, QByteArray(scSmallSize, '1'));
+            QInstaller::appendInt64(&file, QInstaller::MagicCookie);
+
+            QCOMPARE(QInstaller::findMagicCookie(&file, QInstaller::MagicCookie), scSmallSize);
+        } catch (const QInstaller::Error &error) {
+            QFAIL(qPrintable(error.message()));
+        } catch (...) {
+            QFAIL("Unexpected error.");
+        }
+    }
+
+    void findMagicCookieLargeFile()
+    {
+        QTemporaryFile file;
+        file.open();
+
+        try {
+            QInstaller::blockingWrite(&file, QByteArray(scLargeSize, '1'));
+            QInstaller::appendInt64(&file, QInstaller::MagicCookie);
+            QInstaller::blockingWrite(&file, QByteArray(scTinySize, '2'));
+
+            QCOMPARE(QInstaller::findMagicCookie(&file, QInstaller::MagicCookie), scLargeSize);
+        } catch (const QInstaller::Error &error) {
+            QFAIL(qPrintable(error.message()));
+        } catch (...) {
+            QFAIL("Unexpected error.");
+        }
+    }
+
+    void testFindMagicCookieWithError()
+    {
+        QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"No marker found, stopped after 71.00 KiB.\" ");
+
+        QTemporaryFile file;
+        file.open();
+
+        try {
+            QInstaller::blockingWrite(&file, QByteArray(scTinySize, '1'));
+
+            // throws
+            QInstaller::findMagicCookie(&file, QInstaller::MagicCookie);
+        } catch (const QInstaller::Error &error) {
+            QCOMPARE(qPrintable(error.message()), "No marker found, stopped after 71.00 KiB.");
+        } catch (...) {
+            QFAIL("Unexpected error.");
+        }
+    }
+};
+
+QTEST_MAIN(tst_BinaryFormat)
+
+#include "tst_binaryformat.moc"
diff --git a/tests/auto/installer/installer.pro b/tests/auto/installer/installer.pro
index 5873a8db8..414c952d7 100644
--- a/tests/auto/installer/installer.pro
+++ b/tests/auto/installer/installer.pro
@@ -12,5 +12,6 @@ SUBDIRS += \
     consumeoutputoperationtest \
     mkdiroperationtest \
     copyoperationtest \
-    solver
+    solver \
+    binaryformat
 
diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index 283d7bdad..b626d5a2e 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -26,9 +26,9 @@ public:
 
     virtual void init() {}
 
-    void callProtectedDelayedControlScriptExecution(int id)
+    void callProtectedDelayedExecuteControlScript(int id)
     {
-        delayedControlScriptExecution(id);
+        executeControlScript(id);
     }
 };
 
@@ -218,18 +218,16 @@ private slots:
             testGui.loadControlScript(":///data/auto-install.qs");
             QCOMPARE(m_core.value("GuiTestValue"), QString("hello"));
 
-            testGui.show();
             // show event calls automatically the first callback which does not exist
             setExpectedScriptOutput("Control script callback \"IntroductionPageCallback\" does not exist. ");
-            // give some time to the event triggering mechanism
-            qApp->processEvents();
+            testGui.show();
 
             // inside the auto-install script we are clicking the next button, with a not existing button
             QTest::ignoreMessage(QtWarningMsg, "Button with type:  \"unknown button\" not found! ");
-            testGui.callProtectedDelayedControlScriptExecution(PackageManagerCore::ComponentSelection);
+            testGui.callProtectedDelayedExecuteControlScript(PackageManagerCore::ComponentSelection);
 
             setExpectedScriptOutput("FinishedPageCallback - OK");
-            testGui.callProtectedDelayedControlScriptExecution(PackageManagerCore::InstallationFinished);
+            testGui.callProtectedDelayedExecuteControlScript(PackageManagerCore::InstallationFinished);
         } catch (const Error &error) {
             QFAIL(qPrintable(error.message()));
         }