From 28aaf4eb7d89bba113d27a9a39fc787a03a05e31 Mon Sep 17 00:00:00 2001
From: Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>
Date: Wed, 17 Feb 2010 11:40:38 +0200
Subject: Implemented release, update and related callbacks (grant, release,
 lost resources). Initial implementation of audio (group only at this stage).

---
 tests/test-resource-engine/test-resource-engine.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'tests/test-resource-engine/test-resource-engine.cpp')

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;
 }
 
-- 
cgit v1.2.3