--- a/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxeimagedataitemsymbian/unittest_cxeimagedataitemsymbian.h	Thu Jul 15 01:53:45 2010 +0300
+++ b/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxeimagedataitemsymbian/unittest_cxeimagedataitemsymbian.h	Fri Aug 06 10:03:37 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"
@@ -33,19 +33,33 @@
     ~UnitTestCxeImageDataItemSymbian();
 
 private slots:
+    
+    // for every test case
     void init();
+    
+    // for every test case
     void cleanup();
+
+    // before any test cases
+    void initTestCase();
+    // after last test case
+    void cleanupTestCase();
+        
     void testSave();
-    void testSaveFail();
     void testPath();
+    void testState();
+    void testId();
+    void testIsLocationEnabled();
 
 private:
-    QString generateImageFileName(int counter);
-    QString generateImageFileNameWithLetter(int counter, QString letter);
+    QString generateImageFileName();
+    QString dummyPath(const QString &drive);
+    QString path();
 
 private:
     CxeImageDataItemSymbian *mImageDataItem; // This will be recreated for each test
-    QString mPath;
+    QString mFilename;
+    int mImageCounter;
 };
 
 #endif // UNITTEST_CXEIMAGEDATAITEMSYMBIAN_H