diff -r c826656d6714 -r 7e18d488ac5f camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxefeaturemanagerimp/unittest_cxefeaturemanagerimp.cpp --- a/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxefeaturemanagerimp/unittest_cxefeaturemanagerimp.cpp Fri Aug 06 10:03:37 2010 +0300 +++ b/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxefeaturemanagerimp/unittest_cxefeaturemanagerimp.cpp Mon Aug 23 13:50: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" @@ -20,15 +20,14 @@ #include "unittest_cxefeaturemanagerimp.h" #include "cxefeaturemanagerimp.h" #include "cxenamespace.h" -#include "cxesettings.h" - +#include "cxefakesettings.h" static const char* INVALID_KEY = "invalid key"; static const char* EMPTY_KEY = ""; UnitTestCxeFeatureManager::UnitTestCxeFeatureManager() -: mFeatureManager(NULL) +: mFeatureManager(NULL), mFakeSettings(NULL) { } @@ -40,8 +39,9 @@ // Run before each individual test case void UnitTestCxeFeatureManager::init() { + mFakeSettings = new CxeFakeSettings(); // fake model contains initialized test data. - mFeatureManager = new CxeFeatureManagerImp(*mSettings); + mFeatureManager = new CxeFeatureManagerImp(*mFakeSettings); } // Run after each individual test case @@ -49,6 +49,8 @@ { delete mFeatureManager; mFeatureManager = 0; + delete mFakeSettings; + mFakeSettings = NULL; } // Testing that isFeatureSupported function returns correct values