diff options
author | Janos Kovacs <janos.f.kovacs@nokia.com> | 2010-06-28 14:08:00 +0300 |
---|---|---|
committer | Janos Kovacs <janos.f.kovacs@nokia.com> | 2010-06-28 14:08:00 +0300 |
commit | 3f7ebe2f161b0d18f55d547b530f5a999488e03f (patch) | |
tree | 012b4edfcee65785ca752f4bc0a8e90f881f8170 /tests/test-resource | |
parent | 5e7214d0fce9b9214a076d01b9e318d097aa41b4 (diff) |
merging with the swp.plcy-357-harmattan branch
Diffstat (limited to 'tests/test-resource')
-rw-r--r-- | tests/test-resource/test-resource.cpp | 8 | ||||
-rw-r--r-- | tests/test-resource/test-resource.h | 1 |
2 files changed, 9 insertions, 0 deletions
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); |