summaryrefslogtreecommitdiff
path: root/tests/test-resource-engine
diff options
context:
space:
mode:
authorWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-17 11:40:38 +0200
committerWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-17 11:40:38 +0200
commit28aaf4eb7d89bba113d27a9a39fc787a03a05e31 (patch)
tree67f353cda2b44b419d108f5c91e0cf5d1fa27f7a /tests/test-resource-engine
parente288abf93cc33ce7f6d535e1e5d887e8f9628119 (diff)
Implemented release, update and related callbacks (grant, release, lost
resources). Initial implementation of audio (group only at this stage).
Diffstat (limited to 'tests/test-resource-engine')
-rw-r--r--tests/test-resource-engine/test-resource-engine.cpp15
-rw-r--r--tests/test-resource-engine/test-resource-engine.pro2
2 files changed, 9 insertions, 8 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