Implemented release, update and related callbacks (grant, release, lost

resources). Initial implementation of audio (group only at this stage).

5 files changed, 17 insertions, 11 deletions

diff --git a/tests/test-resource-engine/test-resource-engine.cpp b/tests/test-resource-engine/test-resource-engine.cpp
index 15858da..b80beec 100644
--- a/tests/test-resource-engine/test-resource-engine.cpp
+++ b/tests/test-resource-engine/test-resource-engine.cpp
@@ -52,29 +52,29 @@ void TestResourceEngine::init()
     resourceEngine = new ResourceEngine(resourceSet);
     bool initializeSucceeded = resourceEngine->initialize();
     acquireOrDenyWasCalled = false;
-    QVERIFY(!resourceEngine->isConnected());
+    QVERIFY(!resourceEngine->isConnectedToManager());
     QVERIFY(initializeSucceeded);
 }
 
 void TestResourceEngine::testConnect()
 {
-    bool connectIsSuccessful = resourceEngine->connect();
+    bool connectIsSuccessful = resourceEngine->connectToManager();
 
     QVERIFY(connectIsSuccessful);
 }
 
 void TestResourceEngine::testDisconnect()
 {
-    resourceEngine->connect();
+    resourceEngine->connectToManager();
 
-    bool disconnectIsSuccessful = resourceEngine->disconnect();
+    bool disconnectIsSuccessful = resourceEngine->disconnectFromManager();
 
     QVERIFY(disconnectIsSuccessful);
 }
 
 void TestResourceEngine::testStatusMessage()
 {
-    resourceEngine->connect();
+    resourceEngine->connectToManager();
 
     resourceEngine->messageMap.insert(1, RESMSG_REGISTER);
     QObject::connect(resourceEngine, SIGNAL(connectedToManager()), this, SLOT(connectedHandler()));
@@ -84,7 +84,7 @@ void TestResourceEngine::testStatusMessage()
 
 void TestResourceEngine::connectedHandler()
 {
-    QVERIFY(resourceEngine->isConnected());
+    QVERIFY(resourceEngine->isConnectedToManager());
 }
 
 void TestResourceEngine::testAcquire_data()
@@ -113,7 +113,7 @@ void TestResourceEngine::testAcquire()
     acquireShouldSucceed = acquireSucceeds;
     QFETCH(ResourceType, optionalTypeAvailable);
     optionalType = optionalTypeAvailable;
-    resourceEngine->connect();
+    resourceEngine->connectToManager();
     QFETCH(bool, requestFails);
     requestShouldFail = requestFails;
     QFETCH(QString, errorMessage);
@@ -219,7 +219,6 @@ resset_t  *resconn_connect(resconn_t *connection, resmsg_t *message,
     statusMessage.status.errmsg = 0;
     statusMessage.record.id = 11;
     statusMessage.record.reqno = message->record.reqno;
-    callbackFunction(resSet, &statusMessage);
     return resSet;
 }
 
diff --git a/tests/test-resource-engine/test-resource-engine.pro b/tests/test-resource-engine/test-resource-engine.pro
index d558bc2..6084df7 100644
--- a/tests/test-resource-engine/test-resource-engine.pro
+++ b/tests/test-resource-engine/test-resource-engine.pro
@@ -10,12 +10,14 @@ HEADERS +=  $${POLICY}/resource.h \
             $${POLICY}/resources.h \
             $${POLICY}/resource-set.h \
             $${LIBRESOURCEQT}/src/resource-engine.h \
+            $${POLICY}/audio-resource.h \
             test-resource-engine.h
 
 SOURCES +=  $${LIBRESOURCEQT}/src/resource.cpp \
             $${LIBRESOURCEQT}/src/resources.cpp \
             $${LIBRESOURCEQT}/src/resource-set.cpp \
             $${LIBRESOURCEQT}/src/resource-engine.cpp \
+            $${LIBRESOURCEQT}/src/audio-resource.cpp \
             test-resource-engine.cpp
 
 OBJECTS_DIR = build
diff --git a/tests/test-resource-set/test-resource-set.pro b/tests/test-resource-set/test-resource-set.pro
index 84bed87..81b028f 100644
--- a/tests/test-resource-set/test-resource-set.pro
+++ b/tests/test-resource-set/test-resource-set.pro
@@ -7,10 +7,11 @@ INCLUDEPATH += $${LIBRESOURCEQT}/src $${LIBRESOURCEINC} $${LIBDBUSQEVENTLOOP}
 
 # Input
 HEADERS +=  $${POLICY}/resources.h $${POLICY}/resource-set.h test-resource-set.h \
-            $${LIBRESOURCEQT}/src/resource-engine.h
+            $${POLICY}/audio-resource.h $${LIBRESOURCEQT}/src/resource-engine.h
 
 SOURCES +=  $${LIBRESOURCEQT}/src/resource.cpp $${LIBRESOURCEQT}/src/resources.cpp \
             $${LIBRESOURCEQT}/src/resource-engine.cpp \
+            $${LIBRESOURCEQT}/src/audio-resource.cpp \
             $${LIBRESOURCEQT}/src/resource-set.cpp test-resource-set.cpp 
 
 OBJECTS_DIR = build
diff --git a/tests/test-resource/test-resource.h b/tests/test-resource/test-resource.h
index d37dce4..6545d79 100644
--- a/tests/test-resource/test-resource.h
+++ b/tests/test-resource/test-resource.h
@@ -4,6 +4,7 @@
 #include <QtTest/QTest>
 #include <QMetaType>
 #include <policy/resources.h>
+#include <policy/audio-resource.h>
 
 Q_DECLARE_METATYPE(ResourcePolicy::ResourceType)
 
diff --git a/tests/test-resource/test-resource.pro b/tests/test-resource/test-resource.pro
index b103412..5d185ce 100644
--- a/tests/test-resource/test-resource.pro
+++ b/tests/test-resource/test-resource.pro
@@ -6,8 +6,11 @@ DEPENDPATH += $${POLICY} $${LIBRESOURCEQT}/src .
 INCLUDEPATH += $${LIBRESOURCEQT}/src $${LIBRESOURCEINC}
 
 # Input
-HEADERS +=  $${POLICY}/resource.h $${POLICY}/resources.h test-resource.h
-SOURCES +=  $${LIBRESOURCEQT}/src/resource.cpp $${LIBRESOURCEQT}/src/resources.cpp test-resource.cpp
+HEADERS +=  $${POLICY}/resource.h $${POLICY}/resources.h $${POLICY}/audio-resource.h test-resource.h
+SOURCES +=  $${LIBRESOURCEQT}/src/resource.cpp \
+            $${LIBRESOURCEQT}/src/resources.cpp \
+            $${LIBRESOURCEQT}/src/audio-resource.cpp \
+            test-resource.cpp
 
 OBJECTS_DIR = build
 MOC_DIR = build