diff -r 64817133cd1d -r 42ba2d16bf40 camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxesettingsimp/unittest_cxesettingsimp.h
--- a/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxesettingsimp/unittest_cxesettingsimp.h	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxesettingsimp/unittest_cxesettingsimp.h	Wed Aug 18 09:37:18 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -11,18 +11,19 @@
  *
  * Contributors:
  *
- * Description:
+ * Description: This test class contains unit tests for two cxengine classes:
+ * CxeSettings and CxeSettingsImp. CxeSettings is mostly a pure virtual
+ * class containing couple of overloaded versions of get() methods, and so it is
+ * tested together with CxeSettingsImp, which implements CxeSettings
  *
  */
 #ifndef UNITTEST_CXESETTINGSIMP_H
 #define UNITTEST_CXESETTINGSIMP_H
 
 #include <QObject>
-#include <QMetaType>
-
 #include "cxesettingsimp.h"
 
-class CxeFakeSettingsModel;
+class CxeFakeSettingsStore;
 class CxeSettingsImp;
 
 class UnitTestCxeSettingsImp : public QObject
@@ -33,22 +34,32 @@
     UnitTestCxeSettingsImp();
     virtual ~UnitTestCxeSettingsImp();
 
+public slots:
+    void testSlot();
+
 private slots:
     void init();
     void cleanup();
 
+    void testLoadImageSettings();
+    void testLoadVideoSettings();
+    void testLoadImageAndVideoSettings();
+
     void testGet();
     void testGet2();
+    void testGet3();
+    void testGetGarbage();
     void testSet();
-    void testLoadSettings();
+
+    void testReset();
+    void testGetVariationSetting();
+    void testListenForSetting();
 
 private:
 
-    CxeFakeSettingsModel *mSettingsModel;
+    CxeFakeSettingsStore *mSettingsStore;
     CxeSettingsImp *mSettingsImp;
 };
 
-Q_DECLARE_METATYPE(CxeScene)
-
 #endif