Moved dbus autotests into new directory structure

Task-number: QTBUG-21108

Change-Id: I8cdd4af59db3716921e7392379584f349ed29136
Reviewed-on: http://codereview.qt.nokia.com/3602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

3 files changed, 105 insertions, 0 deletions

diff --git a/tests/auto/dbus/qdbuscontext/.gitignore b/tests/auto/dbus/qdbuscontext/.gitignore
new file mode 100644
index 0000000000..64fff94d76
--- /dev/null
+++ b/tests/auto/dbus/qdbuscontext/.gitignore
@@ -0,0 +1 @@
+tst_qdbuscontext
diff --git a/tests/auto/dbus/qdbuscontext/qdbuscontext.pro b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro
new file mode 100644
index 0000000000..ddd340c37e
--- /dev/null
+++ b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro
@@ -0,0 +1,11 @@
+load(qttest_p4)
+QT = core
+
+contains(QT_CONFIG,dbus): {
+	SOURCES += tst_qdbuscontext.cpp
+	QT += dbus
+} else {
+	SOURCES += ../qdbusmarshall/dummy.cpp
+}
+
+
diff --git a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp
new file mode 100644
index 0000000000..8041708151
--- /dev/null
+++ b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtDBus>
+#include <QtTest>
+
+const char errorName[] = "com.trolltech.tst_QDBusContext.Error";
+const char errorMsg[] = "A generic error";
+
+class TestObject: public QObject, protected QDBusContext
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.trolltech.tst_QDBusContext.TestObject")
+public:
+    inline TestObject(QObject *parent) : QObject(parent) { }
+public Q_SLOTS:
+    void generateError();
+};
+
+class tst_QDBusContext: public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void initTestCase();
+    void sendErrorReply();
+};
+
+void TestObject::generateError()
+{
+    sendErrorReply(errorName, errorMsg);
+}
+
+void tst_QDBusContext::initTestCase()
+{
+    TestObject *obj = new TestObject(this);
+    QVERIFY(QDBusConnection::sessionBus().isConnected());
+    QVERIFY(QDBusConnection::sessionBus().registerObject("/TestObject", obj,
+                                                          QDBusConnection::ExportAllSlots));
+}
+
+void tst_QDBusContext::sendErrorReply()
+{
+    QDBusInterface iface(QDBusConnection::sessionBus().baseService(), "/TestObject");
+    QVERIFY(iface.isValid());
+
+    QDBusReply<void> reply = iface.call("generateError");
+    QVERIFY(!reply.isValid());
+
+    const QDBusError &error = reply.error();
+    QCOMPARE(error.name(), QString::fromLatin1(errorName));
+    QCOMPARE(error.message(), QString::fromLatin1(errorMsg));
+}
+
+QTEST_MAIN(tst_QDBusContext)
+
+#include "tst_qdbuscontext.moc"