summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-19 17:07:07 +0200
committerWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-19 17:07:07 +0200
commit8905010dca02a7e3fa2fb1d11cd67aa13598e8d4 (patch)
tree6652cc67f7c49234a958bce71775ce8be4fe8be7
parentd6a687cdff25a69b3333a1e490934128b095f0db (diff)
Updated tests
-rw-r--r--tests/test-resource-engine/test-resource-engine.cpp8
-rw-r--r--tests/test-resource-set/test-resource-set.cpp137
-rw-r--r--tests/test-resource-set/test-resource-set.h4
-rw-r--r--tests/test-resource/test-resource.cpp14
-rw-r--r--tests/test-resource/test-resource.h2
5 files changed, 52 insertions, 113 deletions
diff --git a/tests/test-resource-engine/test-resource-engine.cpp b/tests/test-resource-engine/test-resource-engine.cpp
index 4e21d87..50a74e0 100644
--- a/tests/test-resource-engine/test-resource-engine.cpp
+++ b/tests/test-resource-engine/test-resource-engine.cpp
@@ -33,10 +33,10 @@ TestResourceEngine::TestResourceEngine()
resourceSet = new ResourceSet("player", this);
theID = resourceSet->id();
- resourceSet->addResource(audioPlayback);
- resourceSet->addResource(videoPlayback);
- resourceSet->addResource(audioRecorder);
- resourceSet->addResource(videoRecorder);
+ resourceSet->addResourceObject(audioPlayback);
+ resourceSet->addResourceObject(videoPlayback);
+ resourceSet->addResourceObject(audioRecorder);
+ resourceSet->addResourceObject(videoRecorder);
}
TestResourceEngine::~TestResourceEngine()
diff --git a/tests/test-resource-set/test-resource-set.cpp b/tests/test-resource-set/test-resource-set.cpp
index 7fbf692..d9cbbce 100644
--- a/tests/test-resource-set/test-resource-set.cpp
+++ b/tests/test-resource-set/test-resource-set.cpp
@@ -4,29 +4,29 @@ Resource * TestResourceSet::resourceFromType(ResourceType type)
{
switch (type) {
case AudioPlaybackType:
- return audioResource;
+ return new AudioResource;
case AudioRecorderType:
- return audioRecorderResource;
+ return new AudioRecorderResource;
case VideoPlaybackType:
- return videoResource;
+ return new VideoResource;
case VideoRecorderType:
- return videoRecorderResource;
+ return new VideoRecorderResource;
case VibraType:
- return vibraResource;
+ return new VibraResource;
case LedsType:
- return ledsResource;
+ return new LedsResource;
case BacklightType:
- return backlightResource;
+ return new BacklightResource;
case SystemButtonType:
- return systemButtonResource;
+ return new SystemButtonResource;
case LockButtonType:
- return lockButtonResource;
+ return new LockButtonResource;
case ScaleButtonType:
- return scaleButtonResource;
+ return new ScaleButtonResource;
case SnapButtonType:
- return snapButtonResource;
+ return new SnapButtonResource;
case LensCoverType:
- return lensCoverResource;
+ return new LensCoverResource;
default:
return NULL;
}
@@ -36,34 +36,10 @@ using namespace ResourcePolicy;
TestResourceSet::TestResourceSet()
{
- audioResource = new AudioResource;
- audioRecorderResource = new AudioRecorderResource;
- videoResource = new VideoResource;
- videoRecorderResource = new VideoRecorderResource;
- vibraResource = new VibraResource;
- ledsResource = new LedsResource;
- backlightResource = new BacklightResource;
- systemButtonResource = new SystemButtonResource;
- lockButtonResource = new LockButtonResource;
- scaleButtonResource = new ScaleButtonResource;
- snapButtonResource = new SnapButtonResource;
- lensCoverResource = new LensCoverResource;
}
TestResourceSet::~TestResourceSet()
{
- delete audioResource;
- delete audioRecorderResource;
- delete videoResource;
- delete videoRecorderResource;
- delete vibraResource;
- delete ledsResource;
- delete backlightResource;
- delete systemButtonResource;
- delete lockButtonResource;
- delete scaleButtonResource;
- delete snapButtonResource;
- delete lensCoverResource;
}
void TestResourceSet::init()
@@ -90,78 +66,59 @@ void TestResourceSet::testAddResource()
{
for (int i = 0;i < NumberOfTypes;i++) {
ResourceType type = (ResourceType)i;
- Resource *resource = resourceFromType(type);
- resourceSet->addResource(resource);
+ resourceSet->addResource(type);
bool setContainsGivenResource = resourceSet->contains(type);
QVERIFY(setContainsGivenResource);
}
}
-void TestResourceSet::testAddResources()
+void TestResourceSet::testAddResourceObject()
{
- resourceSet->addResource(audioResource);
-
- bool setContainsAudioResource = resourceSet->contains(AudioPlaybackType);
- QVERIFY(setContainsAudioResource);
- QList<Resource *> resources;
-
- resources << audioResource << videoResource;
-
- resourceSet->addResources(resources);
-
- QVERIFY(resourceSet->contains(AudioPlaybackType));
- QVERIFY(resourceSet->contains(VideoPlaybackType));
+ for (int i = 0;i < NumberOfTypes;i++) {
+ ResourceType type = (ResourceType)i;
+ Resource *resource = resourceFromType(type);
+ resourceSet->addResourceObject(resource);
+ bool setContainsGivenResource = resourceSet->contains(type);
+ QVERIFY(setContainsGivenResource);
+ }
}
void TestResourceSet::testDelResource()
{
- resourceSet->addResource(audioResource);
- resourceSet->addResource(vibraResource);
- resourceSet->deleteResource(AudioPlaybackType);
-
- bool setDoesNotContainAudioResource = !resourceSet->contains(AudioPlaybackType);
- QVERIFY(setDoesNotContainAudioResource);
- QVERIFY(resourceSet->contains(VibraType));
-}
-
-void TestResourceSet::testContainsSingle()
-{
- QList<Resource *> resources;
-
- resources << audioResource << videoResource << audioRecorderResource;
- resourceSet->addResources(resources);
- QList<Resource *> resourcesInSet = resourceSet->resources();
-
- bool containsVideoPlayback = resourceSet->contains(VideoPlaybackType);
- QVERIFY(containsVideoPlayback);
-}
-
-void TestResourceSet::testDoesNotContainSingle()
-{
- QList<Resource *> resources;
-
- resources << audioResource << videoResource;
- resourceSet->addResources(resources);
- QList<Resource *> resourcesInSet = resourceSet->resources();
+ for (int i = 0;i < NumberOfTypes;i++) {
+ ResourceType type = (ResourceType)i;
+ resourceSet->addResource(type);
+ bool setContainsGivenResource = resourceSet->contains(type);
+ QVERIFY(setContainsGivenResource);
+ }
- bool doesNotContainVideoRecorder = !resourceSet->contains(VideoRecorderType);
- QVERIFY(doesNotContainVideoRecorder);
+ for (int i = 0;i < NumberOfTypes;i++) {
+ ResourceType type = (ResourceType)i;
+ resourceSet->deleteResource(type);
+ bool setNoLongerContainType = !resourceSet->contains(type);
+ QVERIFY(setNoLongerContainType);
+ for (int j = 0; j < NumberOfTypes; j++) {
+ if(j == i) continue;
+ ResourceType otherType = (ResourceType)j;
+ bool setStillContainsOtherTypes = resourceSet->contains(otherType);
+ QVERIFY(setStillContainsOtherTypes);
+ }
+ resourceSet->addResource(type);
+ }
}
-
void TestResourceSet::testContainsSet()
{
QList<ResourceType> types, subset;
- QList<Resource *> resources;
-
- types << AudioPlaybackType << VideoPlaybackType
- << AudioRecorderType << VideoRecorderType << LensCoverType;
- subset << AudioPlaybackType << VideoPlaybackType << LensCoverType;
- resources << audioResource << videoResource
- << audioRecorderResource << videoRecorderResource << lensCoverResource;
+ for (int i = 0;i < NumberOfTypes;i++) {
+ ResourceType type = (ResourceType)i;
+ resourceSet->addResource(type);
+ types.append(type);
+ }
- resourceSet->addResources(resources);
+ subset << AudioPlaybackType << VideoPlaybackType
+ << AudioRecorderType << VideoRecorderType << LensCoverType;
bool containsAll = resourceSet->contains(types);
bool containsSubset = resourceSet->contains(subset);
diff --git a/tests/test-resource-set/test-resource-set.h b/tests/test-resource-set/test-resource-set.h
index 24ca0c7..abab859 100644
--- a/tests/test-resource-set/test-resource-set.h
+++ b/tests/test-resource-set/test-resource-set.h
@@ -39,11 +39,9 @@ private slots:
void testIdentifier();
void testAddResource();
- void testAddResources();
+ void testAddResourceObject();
void testDelResource();
- void testContainsSingle();
- void testDoesNotContainSingle();
void testContainsSet();
};
diff --git a/tests/test-resource/test-resource.cpp b/tests/test-resource/test-resource.cpp
index b6879db..44d6c7c 100644
--- a/tests/test-resource/test-resource.cpp
+++ b/tests/test-resource/test-resource.cpp
@@ -167,18 +167,4 @@ void TestResource::testOptional()
QVERIFY(result == expected);
}
-void TestResource::testClone()
-{
- for (quint32 type = AudioPlaybackType; type < NumberOfTypes; type++) {
- Resource *resource = resourceFromType((ResourceType)type);
- resource->setOptional();
- Resource *copy = resource->clone();
-
- QCOMPARE(copy->isOptional(), resource->isOptional());
- QCOMPARE(copy->type(), resource->type());
- delete copy;
- }
-}
-
QTEST_MAIN(TestResource)
-
diff --git a/tests/test-resource/test-resource.h b/tests/test-resource/test-resource.h
index 6545d79..2eb1df0 100644
--- a/tests/test-resource/test-resource.h
+++ b/tests/test-resource/test-resource.h
@@ -42,8 +42,6 @@ private slots:
void testOptional_data();
void testOptional();
-
- void testClone();
};
#endif