summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-01-12 15:14:07 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-01-12 15:50:07 (GMT)
commit152e4ee249915b15241c5f37830f37bb569151b6 (patch)
tree323a7455a64abdd440a160b9f8ada5a6b82a62b5 /tests
parent58a319f851bb5d1a4634df36215694ae1786fbd0 (diff)
downloadQt-152e4ee249915b15241c5f37830f37bb569151b6.zip
Qt-152e4ee249915b15241c5f37830f37bb569151b6.tar.gz
Qt-152e4ee249915b15241c5f37830f37bb569151b6.tar.bz2
Fix D-Bus calls with QDBus::BlockWithGui.
We must wait for a reply in case the reply hasn't been received yet, not if it has already been received. Simple typo. Task-number: QT-2307 Reviewed-by: Trust Me
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qdbusconnection/tst_qdbusconnection.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
index 606659f..5e2f3a9 100644
--- a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
+++ b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp
@@ -86,6 +86,7 @@ private slots:
void connectToBus();
void connect();
void send();
+ void sendWithGui();
void sendAsync();
void sendSignal();
@@ -173,6 +174,22 @@ void tst_QDBusConnection::send()
QVERIFY(reply.arguments().at(0).toStringList().contains(con.baseService()));
}
+void tst_QDBusConnection::sendWithGui()
+{
+ QDBusConnection con = QDBusConnection::sessionBus();
+
+ QVERIFY(con.isConnected());
+
+ QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.DBus",
+ "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames");
+
+ QDBusMessage reply = con.call(msg, QDBus::BlockWithGui);
+
+ QCOMPARE(reply.arguments().count(), 1);
+ QCOMPARE(reply.arguments().at(0).typeName(), "QStringList");
+ QVERIFY(reply.arguments().at(0).toStringList().contains(con.baseService()));
+}
+
void tst_QDBusConnection::sendAsync()
{
QDBusConnection con = QDBusConnection::sessionBus();