2 files changed, 49 insertions, 4 deletions

diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
index 32c228c186..d85e842a23 100644
--- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
+++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
@@ -105,6 +105,8 @@ private slots:
     void sendWithGui();
     void sendAsync();
     void sendSignal();
+    void sendSignalToName();
+    void sendSignalToOtherName();
 
     void registerObject_data();
     void registerObject();
@@ -189,6 +191,49 @@ void tst_QDBusConnection::sendSignal()
     QTest::qWait(1000);
 }
 
+void tst_QDBusConnection::sendSignalToName()
+{
+    QDBusSpy spy;
+
+    QDBusConnection con = QDBusConnection::sessionBus();
+
+    con.connect(con.baseService(), "/org/kde/selftest", "org.kde.selftest", "ping", &spy,
+                SLOT(handlePing(QString)));
+
+    QDBusMessage msg =
+        QDBusMessage::createTargetedSignal(con.baseService(), "/org/kde/selftest",
+                                           "org.kde.selftest", "ping");
+    msg << QLatin1String("ping");
+
+    QVERIFY(con.send(msg));
+
+    QTest::qWait(1000);
+
+    QCOMPARE(spy.args.count(), 1);
+    QCOMPARE(spy.args.at(0).toString(), QString("ping"));
+}
+
+void tst_QDBusConnection::sendSignalToOtherName()
+{
+    QDBusSpy spy;
+
+    QDBusConnection con = QDBusConnection::sessionBus();
+
+    con.connect(con.baseService(), "/org/kde/selftest", "org.kde.selftest", "ping", &spy,
+                SLOT(handlePing(QString)));
+
+    QDBusMessage msg =
+        QDBusMessage::createTargetedSignal("some.other.service", "/org/kde/selftest",
+                                           "org.kde.selftest", "ping");
+    msg << QLatin1String("ping");
+
+    QVERIFY(con.send(msg));
+
+    QTest::qWait(1000);
+
+    QCOMPARE(spy.args.count(), 0);
+}
+
 void tst_QDBusConnection::send()
 {
     QDBusConnection con = QDBusConnection::sessionBus();
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
index 76e740dc5f..11c292db91 100644
--- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -874,7 +874,7 @@ void tst_QDBusMarshall::sendSignalErrors()
                                                   "signalName");
     msg << QVariant::fromValue(QDBusObjectPath());
 
-    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid object path passed in arguments");
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal to service \"\" path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid object path passed in arguments");
     QVERIFY(!con.send(msg));
 
     msg.setArguments(QVariantList());
@@ -884,19 +884,19 @@ void tst_QDBusMarshall::sendSignalErrors()
     path.setPath("abc");
     msg << QVariant::fromValue(path);
 
-    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid object path passed in arguments");
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal to service \"\" path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid object path passed in arguments");
     QVERIFY(!con.send(msg));
 
     QDBusSignature sig;
     msg.setArguments(QVariantList() << QVariant::fromValue(sig));
-    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid signature passed in arguments");
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal to service \"\" path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid signature passed in arguments");
     QVERIFY(!con.send(msg));
 
     QTest::ignoreMessage(QtWarningMsg, "QDBusSignature: invalid signature \"a\"");
     sig.setSignature("a");
     msg.setArguments(QVariantList());
     msg << QVariant::fromValue(sig);
-    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid signature passed in arguments");
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal to service \"\" path \"/foo\" interface \"local.interfaceName\" member \"signalName\": Marshalling failed: Invalid signature passed in arguments");
     QVERIFY(!con.send(msg));
 }