Fixed ResourceSet signals QList<ResourcePolicy::ResourceType> to list

namespace, so the users don't have to use namecpace ResourcePolicy

2 files changed, 84 insertions, 18 deletions

diff --git a/tests/test-resource-set/test-resource-set.cpp b/tests/test-resource-set/test-resource-set.cpp
index d9cbbce..61ea71c 100644
--- a/tests/test-resource-set/test-resource-set.cpp
+++ b/tests/test-resource-set/test-resource-set.cpp
@@ -1,5 +1,7 @@
 #include "test-resource-set.h"
 
+using namespace ResourcePolicy;
+
 Resource * TestResourceSet::resourceFromType(ResourceType type)
 {
     switch (type) {
@@ -125,5 +127,62 @@ void TestResourceSet::testContainsSet()
     QVERIFY(containsAll);
     QVERIFY(containsSubset);
 }
+
+void TestResourceSet::testConnectToSignals()
+{
+    bool signalConnectionSucceeded=false;
+    signalConnectionSucceeded = QObject::connect(resourceSet,
+        SIGNAL(resourcesBecameAvailable(const QList<ResourcePolicy::ResourceType> &)),
+        this, SLOT(handleResourcesBecameAvailable(const QList<ResourcePolicy::ResourceType> &)));
+
+    QVERIFY(signalConnectionSucceeded);
+
+    signalConnectionSucceeded = QObject::connect(resourceSet,
+        SIGNAL(resourcesGranted(const QList<ResourcePolicy::ResourceType> &)),
+        this, SLOT(handleResourcesGranted(const QList<ResourcePolicy::ResourceType> &)));
+
+    QVERIFY(signalConnectionSucceeded);
+
+    signalConnectionSucceeded = QObject::connect(resourceSet,
+        SIGNAL(resourcesDenied()),
+        this, SLOT(handleResourcesDenied()));
+
+    QVERIFY(signalConnectionSucceeded);
+
+    signalConnectionSucceeded = QObject::connect(resourceSet,
+        SIGNAL(resourcesReleased()),
+        this, SLOT(handleResourcesReleased()));
+
+    QVERIFY(signalConnectionSucceeded);
+
+    signalConnectionSucceeded = QObject::connect(resourceSet,
+        SIGNAL(lostResources()),
+        this, SLOT(handleLostResources()));
+
+    QVERIFY(signalConnectionSucceeded);
+
+}
+
+void TestResourceSet::handleResourcesBecameAvailable(const QList<ResourcePolicy::ResourceType> &availableResources)
+{
+
+}
+void TestResourceSet::handleResourcesGranted(const QList<ResourcePolicy::ResourceType> &grantedOptionalResources)
+{
+}
+
+void TestResourceSet::handleResourcesDenied()
+{
+}
+
+void TestResourceSet::handleResourcesReleased()
+{
+}
+
+void TestResourceSet::handleLostResources()
+{
+}
+
+
 QTEST_MAIN(TestResourceSet)
 
diff --git a/tests/test-resource-set/test-resource-set.h b/tests/test-resource-set/test-resource-set.h
index abab859..c112b6c 100644
--- a/tests/test-resource-set/test-resource-set.h
+++ b/tests/test-resource-set/test-resource-set.h
@@ -4,32 +4,37 @@
 #include <QtTest/QTest>
 #include <policy/resource-set.h>
 
-using namespace ResourcePolicy;
-
 class TestResourceSet: public QObject
 {
     Q_OBJECT
 private:
-    ResourceSet *resourceSet;
-
-    AudioResource *audioResource;
-    AudioRecorderResource *audioRecorderResource;
-    Resource *videoResource;
-    Resource *videoRecorderResource;
-    Resource *vibraResource;
-    Resource *ledsResource;
-    Resource *backlightResource;
-    Resource *systemButtonResource;
-    Resource *lockButtonResource;
-    Resource *scaleButtonResource;
-    Resource *snapButtonResource;
-    Resource *lensCoverResource;
-
-    Resource * resourceFromType(ResourceType type);
+    ResourcePolicy::ResourceSet *resourceSet;
+
+    ResourcePolicy::AudioResource *audioResource;
+    ResourcePolicy::AudioRecorderResource *audioRecorderResource;
+    ResourcePolicy::Resource *videoResource;
+    ResourcePolicy::Resource *videoRecorderResource;
+    ResourcePolicy::Resource *vibraResource;
+    ResourcePolicy::Resource *ledsResource;
+    ResourcePolicy::Resource *backlightResource;
+    ResourcePolicy::Resource *systemButtonResource;
+    ResourcePolicy::Resource *lockButtonResource;
+    ResourcePolicy::Resource *scaleButtonResource;
+    ResourcePolicy::Resource *snapButtonResource;
+    ResourcePolicy::Resource *lensCoverResource;
+
+    ResourcePolicy::Resource * resourceFromType(ResourcePolicy::ResourceType type);
 public:
     TestResourceSet();
     ~TestResourceSet();
 
+public slots:
+
+    void handleResourcesBecameAvailable(const QList<ResourcePolicy::ResourceType> &availableResources);
+    void handleResourcesGranted(const QList<ResourcePolicy::ResourceType> &grantedOptionalResources);
+    void handleResourcesDenied();
+    void handleResourcesReleased();
+    void handleLostResources();
 
 private slots:
 
@@ -43,6 +48,8 @@ private slots:
     void testDelResource();
 
     void testContainsSet();
+
+    void testConnectToSignals();
 };
 
 #endif