3 files changed, 15 insertions, 6 deletions
diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
index 504d1a4fea..ab750dff33 100644
--- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
+++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
@@ -1422,7 +1422,7 @@ void tst_QDBusConnection::connectionLimit()
 
     QProcess daemon;
     daemon.start("dbus-daemon",
-                 QStringList() << "--config-file" << QFINDTESTDATA("tst_qdbusconnection.conf")
+                 QStringList() << "--config-file" << QFINDTESTDATA("../qdbusconnection/tst_qdbusconnection.conf")
                                << "--nofork"
                                << "--print-address");
     QVERIFY2(daemon.waitForReadyRead(2000),
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
index e7a8273115..355a65bc59 100644
--- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -161,7 +161,9 @@ void basicStringTypes_data()
 {
     QTest::newRow("string") << QVariant("ping") << "s" << "\"ping\"";
     QTest::newRow("objectpath") << QVariant::fromValue(QDBusObjectPath("/org/kde")) << "o" << "[ObjectPath: /org/kde]";
+    QTest::newRow("emptysignature") << QVariant::fromValue(QDBusSignature(QString())) << "g" << "[Signature: ]";
     QTest::newRow("signature") << QVariant::fromValue(QDBusSignature("g")) << "g" << "[Signature: g]";
+    QTest::newRow("multisignature") << QVariant::fromValue(QDBusSignature("bit")) << "g" << "[Signature: bit]";
     QTest::newRow("emptystring") << QVariant("") << "s" << "\"\"";
     QTest::newRow("nullstring") << QVariant(QString()) << "s" << "\"\"";
 }
@@ -907,7 +909,7 @@ void tst_QDBusMarshall::sendSignalErrors()
     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;
+    QDBusSignature sig(QChar(0));
     msg.setArguments(QVariantList() << QVariant::fromValue(sig));
     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));
@@ -992,7 +994,7 @@ void tst_QDBusMarshall::sendCallErrors_data()
             << "";
 
     QTest::newRow("invalid-signature-arg") << serviceName << objectPath << interfaceName << "ping"
-            << (QVariantList() << QVariant::fromValue(QDBusSignature()))
+            << (QVariantList() << QVariant::fromValue(QDBusSignature(QChar(0))))
             << "org.freedesktop.DBus.Error.Failed"
             << "Marshalling failed: Invalid signature passed in arguments"
             << "";
diff --git a/tests/auto/dbus/qdbustype/tst_qdbustype.cpp b/tests/auto/dbus/qdbustype/tst_qdbustype.cpp
index f4ad4cb77a..63cb7d4a65 100644
--- a/tests/auto/dbus/qdbustype/tst_qdbustype.cpp
+++ b/tests/auto/dbus/qdbustype/tst_qdbustype.cpp
@@ -206,6 +206,7 @@ void tst_QDBusType::isValidBasicType()
 void tst_QDBusType::isValidSingleSignature_data()
 {
     addColumns();
+    QTest::newRow("empty") << "" << false;
     addSingleSignatures();
     addNakedDictEntry();
 }
@@ -222,6 +223,7 @@ void tst_QDBusType::isValidSingleSignature()
 void tst_QDBusType::isValidArray_data()
 {
     addColumns();
+    QTest::newRow("empty") << "" << false;
     addSingleSignatures();
 }
 
@@ -241,7 +243,10 @@ void tst_QDBusType::isValidArray()
 
 void tst_QDBusType::isValidSignature_data()
 {
-    isValidSingleSignature_data();
+    addColumns();
+    QTest::newRow("empty") << "" << true;
+    addSingleSignatures();
+    addNakedDictEntry();
 }
 
 void tst_QDBusType::isValidSignature()
@@ -250,8 +255,10 @@ void tst_QDBusType::isValidSignature()
     QFETCH(bool, result);
 
     data.append(data);
-    if (data.at(0).unicode())
-        QCOMPARE(bool(q_dbus_signature_validate(data.toLatin1(), 0)), result);
+    if (!data.isEmpty() && data.at(0).unicode()) {
+        // libdbus-1 API can't deal with string containing NULs
+        QCOMPARE(bool(q_dbus_signature_validate(data.toLatin1(), nullptr)), result);
+    }
     QCOMPARE(QDBusUtil::isValidSignature(data), result);
 }