[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/playground/libs/qt-dbus/selftests/qdbusabstractadaptor
From:       Thiago Macieira <thiago () kde ! org>
Date:       2006-05-19 14:16:27
Message-ID: 1148048187.265846.25741.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 542516 by thiago:

Update to using the event loop. Unfortunately, there's no overload for \
getting/setting properties using the event loop

 M  +27 -25    tst_qdbusabstractadaptor.cpp  


--- branches/work/kde4/playground/libs/qt-dbus/selftests/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp \
#542515:542516 @@ -453,51 +453,51 @@
 
     // must fail: no object
     //QCOMPARE(empty->call("method").type(), QDBusMessage::ErrorMessage);
-    QCOMPARE(if1->call("method").type(), QDBusMessage::ErrorMessage);
+    QCOMPARE(if1->call(QDBusInterface::UseEventLoop, "method").type(), \
QDBusMessage::ErrorMessage);  
     QFETCH(int, nInterfaces);
     MyObject obj(nInterfaces);
     con.registerObject("/", &obj);
 
     // must fail: no such method
-    QCOMPARE(if1->call("method").type(), QDBusMessage::ErrorMessage);
+    QCOMPARE(if1->call(QDBusInterface::UseEventLoop, "method").type(), \
QDBusMessage::ErrorMessage);  if (!nInterfaces--)
         return;
     if (!nInterfaces--)
         return;
 
     // simple call: one such method exists
-    QCOMPARE(if2->call("method").type(), QDBusMessage::ReplyMessage);
+    QCOMPARE(if2->call(QDBusInterface::UseEventLoop, "method").type(), \
QDBusMessage::ReplyMessage);  QCOMPARE(slotSpy, "void Interface2::method()");
     if (!nInterfaces--)
         return;
 
     // multiple methods in multiple interfaces, no name overlap
-    QCOMPARE(if1->call("methodVoid").type(), QDBusMessage::ErrorMessage);
-    QCOMPARE(if1->call("methodInt").type(), QDBusMessage::ErrorMessage);
-    QCOMPARE(if1->call("methodString").type(), QDBusMessage::ErrorMessage);
-    QCOMPARE(if2->call("methodVoid").type(), QDBusMessage::ErrorMessage);
-    QCOMPARE(if2->call("methodInt").type(), QDBusMessage::ErrorMessage);
-    QCOMPARE(if2->call("methodString").type(), QDBusMessage::ErrorMessage);
+    QCOMPARE(if1->call(QDBusInterface::UseEventLoop, "methodVoid").type(), \
QDBusMessage::ErrorMessage); +    QCOMPARE(if1->call(QDBusInterface::UseEventLoop, \
"methodInt").type(), QDBusMessage::ErrorMessage); +    \
QCOMPARE(if1->call(QDBusInterface::UseEventLoop, "methodString").type(), \
QDBusMessage::ErrorMessage); +    QCOMPARE(if2->call(QDBusInterface::UseEventLoop, \
"methodVoid").type(), QDBusMessage::ErrorMessage); +    \
QCOMPARE(if2->call(QDBusInterface::UseEventLoop, "methodInt").type(), \
QDBusMessage::ErrorMessage); +    QCOMPARE(if2->call(QDBusInterface::UseEventLoop, \
"methodString").type(), QDBusMessage::ErrorMessage);  
-    QCOMPARE(if3->call("methodVoid").type(), QDBusMessage::ReplyMessage);
+    QCOMPARE(if3->call(QDBusInterface::UseEventLoop, "methodVoid").type(), \
QDBusMessage::ReplyMessage);  QCOMPARE(slotSpy, "void Interface3::methodVoid()");
-    QCOMPARE(if3->call("methodInt", 42).type(), QDBusMessage::ReplyMessage);
+    QCOMPARE(if3->call(QDBusInterface::UseEventLoop, "methodInt", 42).type(), \
QDBusMessage::ReplyMessage);  QCOMPARE(slotSpy, "void Interface3::methodInt(int)");
-    QCOMPARE(if3->call("methodString", QString("")).type(), \
QDBusMessage::ReplyMessage); +    QCOMPARE(if3->call(QDBusInterface::UseEventLoop, \
"methodString", QString("")).type(), QDBusMessage::ReplyMessage);  QCOMPARE(slotSpy, \
"void Interface3::methodString(QString)");  
     if (!nInterfaces--)
         return;
 
     // method overloading: different interfaces
-    QCOMPARE(if4->call("method").type(), QDBusMessage::ReplyMessage);
+    QCOMPARE(if4->call(QDBusInterface::UseEventLoop, "method").type(), \
QDBusMessage::ReplyMessage);  QCOMPARE(slotSpy, "void Interface4::method()");
 
     // method overloading: different parameters
-    QCOMPARE(if4->call("method.i", 42).type(), QDBusMessage::ReplyMessage);
+    QCOMPARE(if4->call(QDBusInterface::UseEventLoop, "method.i", 42).type(), \
QDBusMessage::ReplyMessage);  QCOMPARE(slotSpy, "void Interface4::method(int)");
-    QCOMPARE(if4->call("method.s", QString()).type(), QDBusMessage::ReplyMessage);
+    QCOMPARE(if4->call(QDBusInterface::UseEventLoop, "method.s", QString()).type(), \
QDBusMessage::ReplyMessage);  QCOMPARE(slotSpy, "void Interface4::method(QString)");
     
 }
@@ -680,18 +680,19 @@
     MyObject obj;
     con.registerObject("/", &obj);
 
+    QDBusInterfacePtr properties(con, con.baseService(), "/", \
"org.freedesktop.DBus.Properties");  for (int i = 2; i <= 4; ++i) {
         QString name = QString("Interface%1").arg(i);
-        QDBusInterface *iface = con.findInterface(con.baseService(), "/", "local." + \
name);  
         for (int j = 1; j <= 2; ++j) {
             QString propname = QString("prop%1").arg(j);
-            QVariant value = iface->property(propname.toLatin1());
+            QDBusReply<QVariant> reply =
+                properties->call(QDBusInterface::UseEventLoop, "Get", "local." + \
name, propname); +            QVariant value = reply;
 
             QCOMPARE(value.userType(), int(QVariant::String));
             QCOMPARE(value.toString(), QString("QString %1::%2() const").arg(name, \
propname));  }
-        iface->deleteLater();
     }
 }
 
@@ -703,21 +704,21 @@
     MyObject obj;
     con.registerObject("/", &obj);
 
+    QDBusInterfacePtr properties(con, con.baseService(), "/", \
"org.freedesktop.DBus.Properties");  for (int i = 2; i <= 4; ++i) {
         QString name = QString("Interface%1").arg(i);
-        QDBusInterface *iface = con.findInterface(con.baseService(), "/", "local." + \
name);  
         QVariant value(name);
 
         valueSpy.clear();
-        iface->setProperty("prop1", value);
+        properties->call(QDBusInterface::UseEventLoop, "Set", "local." + name, \
QString("prop1"), +                         value);
         QVERIFY(valueSpy.isEmpty()); // call mustn't have succeeded
 
-        iface->setProperty("prop2", value);
+        properties->call(QDBusInterface::UseEventLoop, "Set", "local." + name, \
QString("prop2"), +                         value);
         QCOMPARE(valueSpy, name);
         QCOMPARE(QString(slotSpy), QString("void %1::setProp2(const \
                QString&)").arg(name));
-
-        iface->deleteLater();
     }
 }
 
@@ -965,10 +966,11 @@
     QDBusMessage reply;
     QDBusInterface *iface = con.findInterface(con.baseService(), "/types", \
"local.TypesInterface");  
-    reply = iface->callWithArgs("method" + basename + '.' + signature, \
QVariantList() << value); +    reply = iface->callWithArgs("method" + basename + '.' \
+ signature, QVariantList() << value, +                                \
QDBusInterface::UseEventLoop);  QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
 
-    reply = iface->call("retrieve" + basename);
+    reply = iface->call(QDBusInterface::UseEventLoop, "retrieve" + basename);
     QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
     QCOMPARE(reply.count(), 1);
 


[prev in list] [next in list] [prev in thread] [next in thread]