From 3f7ebe2f161b0d18f55d547b530f5a999488e03f Mon Sep 17 00:00:00 2001
From: Janos Kovacs <janos.f.kovacs@nokia.com>
Date: Mon, 28 Jun 2010 14:08:00 +0300
Subject: merging with the swp.plcy-357-harmattan branch

---
 tests/test-resource-set/test-resource-set.cpp | 3 ++-
 tests/test-resource-set/test-resource-set.h   | 1 +
 tests/test-resource/test-resource.cpp         | 8 ++++++++
 tests/test-resource/test-resource.h           | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test-resource-set/test-resource-set.cpp b/tests/test-resource-set/test-resource-set.cpp
index e5030df..646b90b 100644
--- a/tests/test-resource-set/test-resource-set.cpp
+++ b/tests/test-resource-set/test-resource-set.cpp
@@ -29,6 +29,8 @@ Resource * TestResourceSet::resourceFromType(ResourceType type)
         return new SnapButtonResource;
     case LensCoverType:
         return new LensCoverResource;
+    case HeadsetButtonsType:
+        return headsetButtonsResource;
     default:
         return NULL;
     }
@@ -181,6 +183,5 @@ 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 c112b6c..cba244d 100644
--- a/tests/test-resource-set/test-resource-set.h
+++ b/tests/test-resource-set/test-resource-set.h
@@ -22,6 +22,7 @@ private:
     ResourcePolicy::Resource *scaleButtonResource;
     ResourcePolicy::Resource *snapButtonResource;
     ResourcePolicy::Resource *lensCoverResource;
+    ResourcePolicy::Resource *headsetButtonsResource;
 
     ResourcePolicy::Resource * resourceFromType(ResourcePolicy::ResourceType type);
 public:
diff --git a/tests/test-resource/test-resource.cpp b/tests/test-resource/test-resource.cpp
index 44d6c7c..3c8f397 100644
--- a/tests/test-resource/test-resource.cpp
+++ b/tests/test-resource/test-resource.cpp
@@ -30,6 +30,8 @@ Resource * TestResource::resourceFromType(ResourceType type)
         return snapButtonResource;
     case LensCoverType:
         return lensCoverResource;
+    case HeadsetButtonsType:
+        return headsetButtonsResource;
     default:
         return NULL;
     }
@@ -62,6 +64,8 @@ const char * TestResource::stringFromType(ResourceType type)
         return "SnapButtonType";
     case LensCoverType:
         return "LensCoverType";
+    case HeadsetButtonsType:
+        return "HeadsetButtonsType";
     default:
         qDebug("Unknown Type 0x%02x requested", type);
         return NULL;
@@ -90,6 +94,7 @@ void TestResource::init()
     scaleButtonResource = new ScaleButtonResource;
     snapButtonResource = new SnapButtonResource;
     lensCoverResource = new LensCoverResource;
+    headsetButtonsResource = new HeadsetButtonsResource;
 }
 
 void TestResource::cleanup()
@@ -106,6 +111,7 @@ void TestResource::cleanup()
     delete scaleButtonResource;
     delete snapButtonResource;
     delete lensCoverResource;
+    delete headsetButtonsResource;
 }
 
 void TestResource::testType()
@@ -151,6 +157,8 @@ void TestResource::testOptional_data()
     QTest::newRow("Resource is not optional") << SnapButtonType << false << false;
     QTest::newRow("Resource is optional") << LensCoverType << true << true;
     QTest::newRow("Resource is not optional") << LensCoverType << false << false;
+    QTest::newRow("Resource is optional") << HeadsetButtonsType << true << true;
+    QTest::newRow("Resource is not optional") << HeadsetButtonsType << false << false;
 }
 
 void TestResource::testOptional()
diff --git a/tests/test-resource/test-resource.h b/tests/test-resource/test-resource.h
index 2eb1df0..e301cc3 100644
--- a/tests/test-resource/test-resource.h
+++ b/tests/test-resource/test-resource.h
@@ -26,6 +26,7 @@ private:
     Resource *scaleButtonResource;
     Resource *snapButtonResource;
     Resource *lensCoverResource;
+    Resource *headsetButtonsResource;
 
     Resource * resourceFromType(ResourceType type);
     const char * stringFromType(ResourceType type);
-- 
cgit v1.2.3