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

List:       kde-commits
Subject:    branches/work/~ervin/qtjolie
From:       Kevin Ottens <ervin () kde ! org>
Date:       2009-05-08 8:24:00
Message-ID: 1241771040.595801.14182.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 965146 by ervin:

Provide a MetaService convenience class to control jolie's metaservice.


 M  +1 -0      includes/CMakeLists.txt  
 A             includes/QtJolie/MetaService  
 M  +2 -1      qtjolie/CMakeLists.txt  
 A             qtjolie/metaservice.cpp   [License: LGPL (v2+)]
 A             qtjolie/metaservice.h   [License: LGPL (v2+)]
 M  +10 -45    tests/testmetaservice.cpp  


--- branches/work/~ervin/qtjolie/includes/CMakeLists.txt #965145:965146
@@ -2,6 +2,7 @@
   QtJolie/Client
   QtJolie/Fault
   QtJolie/Message
+  QtJolie/MetaService
   QtJolie/PendingCall
   QtJolie/Value
 DESTINATION ${INCLUDE_INSTALL_DIR}/QtJolie COMPONENT Devel)
--- branches/work/~ervin/qtjolie/qtjolie/CMakeLists.txt #965145:965146
@@ -5,7 +5,7 @@
                     ${CMAKE_CURRENT_BINARY_DIR}
                     ${QT_INCLUDE_DIR})
 
-set(qtjolie_LIB_SRCS client.cpp clientthread.cpp value.cpp fault.cpp message.cpp \
pendingcall.cpp) +set(qtjolie_LIB_SRCS client.cpp clientthread.cpp value.cpp \
fault.cpp message.cpp metaservice.cpp pendingcall.cpp)  
 kde4_add_library(QtJolie SHARED ${qtjolie_LIB_SRCS})
 
@@ -21,5 +21,6 @@
         value.h
         fault.h
         message.h
+        metaservice.h
         pendingcall.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/qtjolie)
--- branches/work/~ervin/qtjolie/tests/testmetaservice.cpp #965145:965146
@@ -24,6 +24,7 @@
 
 #include <QtJolie/Client>
 #include <QtJolie/Message>
+#include <QtJolie/MetaService>
 #include <QtJolie/PendingCall>
 #include "testhelpers.h"
 
@@ -66,7 +67,7 @@
 {
     Q_OBJECT
 
-    QProcess m_metaserviceProcess;
+    MetaService m_metaService;
     Client *m_client;
 
 public:
@@ -79,8 +80,7 @@
 private slots:
     void initTestCase()
     {
-        m_metaserviceProcess.start("metaservice");
-        QVERIFY2(m_metaserviceProcess.waitForStarted(), "Looks like you don't have \
Jolie's metaservice command"); +        QVERIFY2(m_metaService.start(), "Looks like \
you don't have Jolie's metaservice command");  QTest::qWait(1000);
 
         m_client = new Client("localhost", 9000);
@@ -88,11 +88,8 @@
 
     void cleanupTestCase()
     {
-        Message message("/", "shutdown");
-        m_client->callNoReply(message);
         delete m_client;
-
-        m_metaserviceProcess.waitForFinished();
+        QVERIFY(m_metaService.stop());
     }
 
     void shouldLoadService_data()
@@ -109,39 +106,15 @@
         QFETCH(QString, resourcePrefix);
         QFETCH(QString, fileName);
 
-        Message message("/", "loadEmbeddedJolieService");
-        Value value;
-        value.children("resourcePrefix") << Value(resourcePrefix);
-        value.children("filepath") << Value(QString(DATA_DIR"/")+fileName);
-        message.setData(value);
-
-        Message reply = m_client->call(message);
-
-        Message expected("/", "loadEmbeddedJolieService");
-        expected.setData(Value(resourcePrefix));
-
-        sodepCompare(reply, expected);
+        QCOMPARE(m_metaService.loadService(resourcePrefix, \
QString(DATA_DIR"/")+fileName), +                 resourcePrefix);
     }
 
     void shouldListServices()
     {
-        Message message("/", "getServices");
-
-        Message reply = m_client->call(message);
-        Message expected("/", "getServices");
-        Value value;
-
-        Value s1;
-        s1.children("isEmbedded") << Value(1);
-        s1.children("resourceName") << Value("Math");
-        Value s2;
-        s2.children("isEmbedded") << Value(1);
-        s2.children("resourceName") << Value("Printer");
-
-        value.children("service") << s1 << s2;
-        expected.setData(value);
-
-        sodepCompare(reply, expected);
+        QStringList expected;
+        expected << "Math" << "Printer";
+        QCOMPARE(m_metaService.loadedServices(), expected);
     }
 
     void shouldPlaceServiceCalls_data()
@@ -185,15 +158,7 @@
     {
         QFETCH(QString, serviceName);
 
-        Message message("/", "unloadEmbeddedService");
-        Value value(serviceName);
-        message.setData(value);
-
-        Message reply = m_client->call(message);
-
-        Message expected("/", "unloadEmbeddedService");
-
-        sodepCompare(reply, expected);
+        m_metaService.unloadService(serviceName);
     }
 };
 


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