diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp | 14 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp index b696294005..7ac5cd3c6c 100644 --- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp @@ -1034,9 +1034,9 @@ void tst_QDBusAbstractInterface::createErrors_data() QTest::addColumn<QString>("path"); QTest::addColumn<QString>("errorName"); - QTest::newRow("invalid-service") << "this isn't valid" << "/" << "com.trolltech.QtDBus.Error.InvalidService"; + QTest::newRow("invalid-service") << "this isn't valid" << "/" << "org.qtproject.QtDBus.Error.InvalidService"; QTest::newRow("invalid-path") << QDBusConnection::sessionBus().baseService() << "this isn't valid" - << "com.trolltech.QtDBus.Error.InvalidObjectPath"; + << "org.qtproject.QtDBus.Error.InvalidObjectPath"; } void tst_QDBusAbstractInterface::createErrors() @@ -1055,7 +1055,7 @@ void tst_QDBusAbstractInterface::createErrorsPeer_data() QTest::addColumn<QString>("path"); QTest::addColumn<QString>("errorName"); - QTest::newRow("invalid-path") << "this isn't valid" << "com.trolltech.QtDBus.Error.InvalidObjectPath"; + QTest::newRow("invalid-path") << "this isn't valid" << "org.qtproject.QtDBus.Error.InvalidObjectPath"; } void tst_QDBusAbstractInterface::createErrorsPeer() @@ -1071,10 +1071,10 @@ void tst_QDBusAbstractInterface::createErrorsPeer() void tst_QDBusAbstractInterface::callErrors_data() { createErrors_data(); - QTest::newRow("service-wildcard") << QString() << "/" << "com.trolltech.QtDBus.Error.InvalidService"; + QTest::newRow("service-wildcard") << QString() << "/" << "org.qtproject.QtDBus.Error.InvalidService"; QTest::newRow("path-wildcard") << QDBusConnection::sessionBus().baseService() << QString() - << "com.trolltech.QtDBus.Error.InvalidObjectPath"; - QTest::newRow("full-wildcard") << QString() << QString() << "com.trolltech.QtDBus.Error.InvalidService"; + << "org.qtproject.QtDBus.Error.InvalidObjectPath"; + QTest::newRow("full-wildcard") << QString() << QString() << "org.qtproject.QtDBus.Error.InvalidService"; } void tst_QDBusAbstractInterface::callErrors() @@ -1113,7 +1113,7 @@ void tst_QDBusAbstractInterface::asyncCallErrors() void tst_QDBusAbstractInterface::callErrorsPeer_data() { createErrorsPeer_data(); - QTest::newRow("path-wildcard") << QString() << "com.trolltech.QtDBus.Error.InvalidObjectPath"; + QTest::newRow("path-wildcard") << QString() << "org.qtproject.QtDBus.Error.InvalidObjectPath"; } void tst_QDBusAbstractInterface::callErrorsPeer() diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index 13f3bd2060..57d7f82c1f 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -928,26 +928,26 @@ void tst_QDBusMarshall::sendCallErrors_data() << "Method \"ping\" with signature \"\" on interface \"com.trolltech.autotests.qpong\" doesn't exist\n" << (const char*)0; QTest::newRow("invalid-service") << "this isn't valid" << objectPath << interfaceName << "ping" << QVariantList() - << "com.trolltech.QtDBus.Error.InvalidService" + << "org.qtproject.QtDBus.Error.InvalidService" << "Invalid service name: this isn't valid" << ""; QTest::newRow("empty-path") << serviceName << "" << interfaceName << "ping" << QVariantList() - << "com.trolltech.QtDBus.Error.InvalidObjectPath" + << "org.qtproject.QtDBus.Error.InvalidObjectPath" << "Object path cannot be empty" << ""; QTest::newRow("invalid-path") << serviceName << "//" << interfaceName << "ping" << QVariantList() - << "com.trolltech.QtDBus.Error.InvalidObjectPath" + << "org.qtproject.QtDBus.Error.InvalidObjectPath" << "Invalid object path: //" << ""; // empty interfaces are valid QTest::newRow("invalid-interface") << serviceName << objectPath << "this isn't valid" << "ping" << QVariantList() - << "com.trolltech.QtDBus.Error.InvalidInterface" + << "org.qtproject.QtDBus.Error.InvalidInterface" << "Invalid interface class: this isn't valid" << ""; QTest::newRow("empty-method") << serviceName << objectPath << interfaceName << "" << QVariantList() - << "com.trolltech.QtDBus.Error.InvalidMember" + << "org.qtproject.QtDBus.Error.InvalidMember" << "method name cannot be empty" << ""; QTest::newRow("invalid-method") << serviceName << objectPath << interfaceName << "this isn't valid" << QVariantList() - << "com.trolltech.QtDBus.Error.InvalidMember" + << "org.qtproject.QtDBus.Error.InvalidMember" << "Invalid method name: this isn't valid" << ""; QTest::newRow("invalid-variant1") << serviceName << objectPath << interfaceName << "ping" |