--- a/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxeautofocuscontrolsymbian/unittest_cxeautofocuscontrolsymbian.cpp	Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxeautofocuscontrolsymbian/unittest_cxeautofocuscontrolsymbian.cpp	Thu Jul 15 01:55:05 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"
@@ -23,13 +23,15 @@
 #include "cxetestutils.h"
 #include "cxefakecameradevicecontrol.h"
 #include "cxefakecameradevice.h"
+#include "cxefakesettings.h"
 #include "cxeautofocuscontrolsymbian.h"
 #include "unittest_cxeautofocuscontrolsymbian.h"
 
 UnitTestCxeAutoFocusControlSymbian::UnitTestCxeAutoFocusControlSymbian()
-    : mAutoFocusControl(0),
-      mCameraDeviceControl(0),
-      mCameraDevice(0)
+    : mAutoFocusControl(NULL),
+      mCameraDeviceControl(NULL),
+      mCameraDevice(NULL),
+      mFakeSettings(NULL)
 {
 }
 
@@ -43,11 +45,13 @@
 {
     qDebug() << "UnitTestCxeAutoFocusControlSymbian::init =>";
 
+    mFakeSettings = new CxeFakeSettings();
+
     mCameraDeviceControl = new CxeFakeCameraDeviceControl();
     mCameraDevice = new CxeFakeCameraDevice();
     mCameraDevice->newCamera(mCameraDeviceControl->cameraIndex(), mCameraDeviceControl);
 
-    mAutoFocusControl = new CxeAutoFocusControlSymbian(*mCameraDevice);
+    mAutoFocusControl = new CxeAutoFocusControlSymbian(*mCameraDevice, *mFakeSettings);
     //mAutoFocusControl->initializeResources();
 
     connect(mCameraDeviceControl, SIGNAL(cameraEvent(int,int)),
@@ -61,15 +65,18 @@
 {
     qDebug() << "UnitTestCxeAutoFocusControlSymbian::cleanup =>";
     delete mAutoFocusControl;
-    mAutoFocusControl = 0;
+    mAutoFocusControl = NULL;
 
     delete mCameraDeviceControl;
-    mCameraDeviceControl = 0;
+    mCameraDeviceControl = NULL;
 
     delete mCameraDevice;
-    mCameraDevice = 0;
+    mCameraDevice = NULL;
+
+    delete mFakeSettings;
+    mFakeSettings = NULL;
+
     qDebug() << "UnitTestCxeAutoFocusControlSymbian::cleanup <=";
-
 }
 
 
@@ -108,6 +115,15 @@
     QVERIFY(mAutoFocusControl->mode() == CxeAutoFocusControl::Portrait);
 }
 
+void UnitTestCxeAutoFocusControlSymbian::testIsFixedFocusMode()
+{
+    QVERIFY(mAutoFocusControl->isFixedFocusMode(CxeAutoFocusControl::Auto) == false);
+    QVERIFY(mAutoFocusControl->isFixedFocusMode(CxeAutoFocusControl::Hyperfocal) == true);
+    QVERIFY(mAutoFocusControl->isFixedFocusMode(CxeAutoFocusControl::Macro) == false);
+    QVERIFY(mAutoFocusControl->isFixedFocusMode(CxeAutoFocusControl::Infinity) == true);
+    QVERIFY(mAutoFocusControl->isFixedFocusMode(CxeAutoFocusControl::Portrait) == false);
+}
+
 void UnitTestCxeAutoFocusControlSymbian::testSupported()
 {
     bool supported = mAutoFocusControl->supported();