[telepathy-qt4/master] client-handler test: Improved registerClient test.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Thu May 7 10:22:41 PDT 2009


---
 tests/dbus/client-handler.cpp |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/dbus/client-handler.cpp b/tests/dbus/client-handler.cpp
index 208f2ee..d8cf138 100644
--- a/tests/dbus/client-handler.cpp
+++ b/tests/dbus/client-handler.cpp
@@ -393,6 +393,9 @@ void TestClientHandler::init()
 
 void TestClientHandler::testRegister()
 {
+    // invalid client
+    QVERIFY(!mClientRegistrar->registerClient(ClientObjectPtr()));
+
     ChannelClassList filters;
     QMap<QString, QDBusVariant> filter;
     filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
@@ -402,7 +405,11 @@ void TestClientHandler::testRegister()
     filters.append(filter);
     mClientObject1 = ClientObject::create(
             MyHandler::create(filters, false, true));
-    mClientRegistrar->registerClient(mClientObject1);
+    QVERIFY(mClientRegistrar->registerClient(mClientObject1));
+    QVERIFY(mClientRegistrar->registeredClients().contains(mClientObject1));
+
+    // no op - client already registered
+    QVERIFY(mClientRegistrar->registerClient(mClientObject1));
 
     filters.clear();
     filter.clear();
@@ -413,7 +420,11 @@ void TestClientHandler::testRegister()
     filters.append(filter);
     mClientObject2 = ClientObject::create(
             MyHandler::create(filters, true, true));
-    mClientRegistrar->registerClient(mClientObject2, true);
+    QVERIFY(mClientRegistrar->registerClient(mClientObject2, true));
+    QVERIFY(mClientRegistrar->registeredClients().contains(mClientObject2));
+
+    // no op - client already registered
+    QVERIFY(mClientRegistrar->registerClient(mClientObject2, true));
 
     QDBusConnection bus = mClientRegistrar->dbusConnection();
     QDBusConnectionInterface *busIface = bus.interface();
-- 
1.5.6.5




More information about the telepathy-commits mailing list