camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxeautofocuscontrolsymbian/unittest_cxeautofocuscontrolsymbian.cpp
changeset 36 b12f3922a74f
parent 32 5c1e3c6aa4ef
child 46 c826656d6714
--- a/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxeautofocuscontrolsymbian/unittest_cxeautofocuscontrolsymbian.cpp	Fri Jun 11 13:26:48 2010 +0300
+++ b/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxeautofocuscontrolsymbian/unittest_cxeautofocuscontrolsymbian.cpp	Wed Jun 23 17:59:54 2010 +0300
@@ -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 <=";
-
 }