Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

10 files changed, 554 insertions, 0 deletions

diff --git a/tests/benchmarks/dbus/dbus.pro b/tests/benchmarks/dbus/dbus.pro
new file mode 100644
index 0000000000..989a0db2d4
--- /dev/null
+++ b/tests/benchmarks/dbus/dbus.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+        qdbusperformance \
+        qdbustype
diff --git a/tests/benchmarks/dbus/qdbusperformance/.gitignore b/tests/benchmarks/dbus/qdbusperformance/.gitignore
new file mode 100644
index 0000000000..4cd83993de
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/.gitignore
@@ -0,0 +1,2 @@
+tst_qdbusperformance
+server/server
diff --git a/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro
new file mode 100644
index 0000000000..90f88a70ec
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS = server test
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
new file mode 100644
index 0000000000..3bd5efc108
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore/QtCore>
+#include <QtDBus/QtDBus>
+
+#include "../serverobject.h"
+
+static const char serviceName[] = "com.trolltech.autotests.performance";
+static const char objectPath[] = "/";
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    QDBusConnection con = QDBusConnection::sessionBus();
+    if (!con.isConnected())
+        exit(1);
+
+    if (!con.registerService(serviceName))
+        exit(2);
+
+    ServerObject obj(objectPath, con);
+    printf("ready.\n");
+    return app.exec();
+}
+
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.pro b/tests/benchmarks/dbus/qdbusperformance/server/server.pro
new file mode 100644
index 0000000000..30f81dd19f
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/server/server.pro
@@ -0,0 +1,5 @@
+SOURCES = server.cpp
+HEADERS = ../serverobject.h
+TARGET = server
+CONFIG += qdbus
+QT -= gui
diff --git a/tests/benchmarks/dbus/qdbusperformance/serverobject.h b/tests/benchmarks/dbus/qdbusperformance/serverobject.h
new file mode 100644
index 0000000000..6f85bb4e50
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/serverobject.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef SERVEROBJECT_H
+#define SERVEROBJECT_H
+
+#include <QObject>
+#include <QtDBus/QtDBus>
+
+class ServerObject: public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.trolltech.autotests.Performance")
+public:
+    ServerObject(const QString &objectPath, QDBusConnection conn, QObject *parent = 0)
+        : QObject(parent)
+    {
+        conn.registerObject(objectPath, this, QDBusConnection::ExportAllSlots);
+    }
+
+public slots:
+    Q_NOREPLY void noReply(const QByteArray &)
+    {
+        // black hole
+    }
+    Q_NOREPLY void noReply(const QString &)
+    {
+        // black hole
+    }
+    Q_NOREPLY void noReply(const QDBusVariant &)
+    {
+        // black hole
+    }
+
+    int size(const QByteArray &data)
+    {
+        return data.size();
+    }
+    int size(const QString &data)
+    {
+        return data.size();
+    }
+    int size(const QDBusVariant &data)
+    {
+        QVariant v = data.variant();
+        switch (v.type())
+        {
+        case QVariant::ByteArray:
+            return v.toByteArray().size();
+        case QVariant::StringList:
+            return v.toStringList().size();
+        case QVariant::String:
+        default:
+            return v.toString().size();
+        }
+    }
+
+    QByteArray echo(const QByteArray &data)
+    {
+        return data;
+    }
+    QString echo(const QString &data)
+    {
+        return data;
+    }
+    QDBusVariant echo(const QDBusVariant &data)
+    {
+        return data;
+    }
+
+    void nothing()
+    {
+    }
+};
+
+#endif
diff --git a/tests/benchmarks/dbus/qdbusperformance/test/test.pro b/tests/benchmarks/dbus/qdbusperformance/test/test.pro
new file mode 100644
index 0000000000..9f5712e9e2
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/test/test.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+SOURCES += ../tst_qdbusperformance.cpp
+HEADERS += ../serverobject.h
+TARGET = ../tst_qdbusperformance
+
+QT = core
+CONFIG += qdbus
diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
new file mode 100644
index 0000000000..a5b4b98ad1
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
@@ -0,0 +1,230 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore/QtCore>
+#include <QtTest/QtTest>
+#include <QtDBus/QtDBus>
+
+#include "./serverobject.h"
+
+static const char serviceName[] = "com.trolltech.autotests.performance";
+static const int runTime = 500;
+
+class tst_QDBusPerformance: public QObject
+{
+    Q_OBJECT
+    QProcess proc;
+    QDBusInterface *target;
+
+    QDBusInterface *remote;
+    QDBusInterface *local;
+
+    bool executeTest(const char *funcname, int size, const QVariant &data);
+
+public slots:
+    void initTestCase_data();
+    void initTestCase();
+    void init();
+
+private slots:
+    void callSpeed();
+
+    void oneWay_data();
+    void oneWay();
+    void oneWayVariant_data();
+    void oneWayVariant();
+
+    void roundTrip_data();
+    void roundTrip();
+    void roundTripVariant_data();
+    void roundTripVariant();
+};
+Q_DECLARE_METATYPE(QVariant)
+
+void tst_QDBusPerformance::initTestCase()
+{
+    QDBusConnection con = QDBusConnection::sessionBus();
+    QVERIFY(con.isConnected());
+
+    QDBusServiceWatcher watcher(serviceName, con,
+                                QDBusServiceWatcher::WatchForRegistration);
+    connect(&watcher, SIGNAL(serviceRegistered(QString)),
+            &QTestEventLoop::instance(), SLOT(exitLoop()));
+
+#ifdef Q_OS_WIN
+    proc.start("server");
+#else
+    proc.start("./server/server");
+#endif
+    QVERIFY(proc.waitForStarted());
+
+    QTestEventLoop::instance().enterLoop(5);
+    QVERIFY(con.interface()->isServiceRegistered(serviceName));
+
+    remote = new QDBusInterface(serviceName, "/", "com.trolltech.autotests.Performance", con, this);
+    QVERIFY(remote->isValid());
+
+    new ServerObject("/", con, this);
+    local = new QDBusInterface(con.baseService(), "/", "com.trolltech.autotests.Performance", con, this);
+    QVERIFY(local->isValid());
+}
+
+void tst_QDBusPerformance::initTestCase_data()
+{
+    QTest::addColumn<bool>("loopback");
+
+    QTest::newRow("normal") << false;
+    QTest::newRow("loopback") << true;
+}
+
+void tst_QDBusPerformance::init()
+{
+    QFETCH_GLOBAL(bool, loopback);
+    if (loopback)
+        target = local;
+    else
+        target = remote;
+}
+
+void tst_QDBusPerformance::callSpeed()
+{
+    QElapsedTimer timer;
+
+    int callCount = 0;
+    timer.start();
+    while (timer.elapsed() < runTime) {
+        QDBusReply<void> reply = target->call("nothing");
+        QVERIFY(reply.isValid());
+
+        ++callCount;
+    }
+    qDebug() << callCount << "calls in" << timer.elapsed() << "ms:"
+             << (callCount * 1000.0 / timer.elapsed()) << "calls/sec";
+}
+
+bool tst_QDBusPerformance::executeTest(const char *funcname, int size, const QVariant &data)
+{
+    QElapsedTimer timer;
+
+    int callCount = 0;
+    qint64 transferred = 0;
+    timer.start();
+    while (timer.elapsed() < runTime) {
+        QDBusMessage reply = target->call(funcname, data);
+        if (reply.type() != QDBusMessage::ReplyMessage)
+            return false;
+
+        transferred += size;
+        ++callCount;
+    }
+    qDebug() << transferred << "bytes in" << timer.elapsed() << "ms"
+             << "(in" << callCount << "calls):"
+             << (transferred * 1000.0 / timer.elapsed() / 1024 / 1024) << "MB/s";
+
+    return true;
+}
+
+void tst_QDBusPerformance::oneWay_data()
+{
+    QTest::addColumn<QVariant>("data");
+    QTest::addColumn<int>("size");
+
+    QByteArray ba(256, 'a');
+    while (ba.size() < 8193) {
+        QTest::newRow(QString("%1-byteArray").arg(ba.size()).toAscii()) << qVariantFromValue(ba) << ba.size();
+        ba += ba;
+    }
+
+    QString s(256, QLatin1Char('a'));
+    while (s.size() < 8193) {
+        QTest::newRow(QString("%1-string").arg(s.size()).toAscii()) << qVariantFromValue(s) << s.size();
+        s += s;
+    }
+}
+
+void tst_QDBusPerformance::oneWay()
+{
+    QFETCH(QVariant, data);
+    QFETCH(int, size);
+
+    QVERIFY(executeTest("size", size, data));
+}
+
+void tst_QDBusPerformance::oneWayVariant_data()
+{
+    oneWay_data();
+}
+
+void tst_QDBusPerformance::oneWayVariant()
+{
+    QFETCH(QVariant, data);
+    QFETCH(int, size);
+
+    QVERIFY(executeTest("size", size, qVariantFromValue(QDBusVariant(data))));
+}
+
+void tst_QDBusPerformance::roundTrip_data()
+{
+    oneWay_data();
+}
+
+void tst_QDBusPerformance::roundTrip()
+{
+    QFETCH(QVariant, data);
+    QFETCH(int, size);
+
+    QVERIFY(executeTest("echo", size, data));
+}
+
+void tst_QDBusPerformance::roundTripVariant_data()
+{
+    oneWay_data();
+}
+
+void tst_QDBusPerformance::roundTripVariant()
+{
+    QFETCH(QVariant, data);
+    QFETCH(int, size);
+
+    QVERIFY(executeTest("echo", size, qVariantFromValue(QDBusVariant(data))));
+}
+
+QTEST_MAIN(tst_QDBusPerformance)
+#include "tst_qdbusperformance.moc"
diff --git a/tests/benchmarks/dbus/qdbustype/main.cpp b/tests/benchmarks/dbus/qdbustype/main.cpp
new file mode 100644
index 0000000000..abaae7eedc
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbustype/main.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the FOO module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtCore/QCoreApplication>
+
+#include <QtDBus/private/qdbusutil_p.h>
+
+#include <dbus/dbus.h>
+
+class tst_QDBusType: public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void benchmarkSignature_data();
+    void benchmarkSignature();
+};
+
+static inline void benchmarkAddRow(const char *name, const char *data)
+{
+    QTest::newRow(QByteArray("native-") + name) << data << true;
+    QTest::newRow(name) << data << false;
+}
+
+void tst_QDBusType::benchmarkSignature_data()
+{
+    QTest::addColumn<QString>("data");
+    QTest::addColumn<bool>("useNative");
+
+    for (int loopCount = 0; loopCount < 2; ++loopCount) {
+        bool useNative = loopCount;
+        QByteArray prefix = useNative ? "native-" : "";
+
+        benchmarkAddRow("single-invalid", "~");
+        benchmarkAddRow("single-invalid-array", "a~");
+        benchmarkAddRow("single-invalid-struct", "(.)");
+
+        benchmarkAddRow("single-char", "b");
+        benchmarkAddRow("single-array", "as");
+        benchmarkAddRow("single-simplestruct", "(y)");
+        benchmarkAddRow("single-simpledict", "a{sv}");
+        benchmarkAddRow("single-complexdict", "a{s(aya{io})}");
+
+        benchmarkAddRow("multiple-char", "ssg");
+        benchmarkAddRow("multiple-arrays", "asasay");
+
+        benchmarkAddRow("struct-missingclose", "(ayyyy");
+        benchmarkAddRow("longstruct", "(yyyyyyayasy)");
+        benchmarkAddRow("invalid-longstruct", "(yyyyyyayas.y)");
+        benchmarkAddRow("complexstruct", "(y(aasay)oga{sv})");
+        benchmarkAddRow("multiple-simple-structs", "(y)(y)(y)");
+    }
+}
+
+void tst_QDBusType::benchmarkSignature()
+{
+    QFETCH(QString, data);
+    QFETCH(bool, useNative);
+
+    bool result;
+    if (useNative) {
+        dbus_signature_validate(data.toLatin1(), 0);
+        QBENCHMARK {
+            result = dbus_signature_validate(data.toLatin1(), 0);
+        }
+    } else {
+        QDBusUtil::isValidSignature(data);
+        QBENCHMARK {
+            result = QDBusUtil::isValidSignature(data);
+        }
+    }
+    Q_UNUSED(result);
+}
+
+QTEST_MAIN(tst_QDBusType)
+
+#include "main.moc"
diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro
new file mode 100644
index 0000000000..d480a05f38
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+TARGET = tst_bench_qdbustype
+QT -= gui
+QT += dbus
+QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
+LIBS_PRIVATE += $$QT_LIBS_DBUS
+
+SOURCES += main.cpp