authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp
branchRCL_3
changeset 47 b54b58ee9d58
parent 8 35751d3474b7
child 61 641f389e9157
--- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp	Wed Apr 14 17:48:59 2010 +0300
+++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp	Tue Apr 27 18:28:15 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -25,6 +25,7 @@
 #include "tupsdbstep.h"
 #include <test/testexecutelog.h>
 
+
 using namespace UserPromptService;
 
 
@@ -449,23 +450,23 @@
 			upsDb = CDecisionDbW::NewL(iDbLocation,iFs);
 			CleanupStack::PushL(upsDb);
 			
-			RPointerArray<CDecisionRecord> recordList = GetDecisionsL(*upsDb,*filter,iCancel);
+			RPointerArray<CDecisionRecord> recordList;
+			CleanupResetAndDestroyPushL(recordList);
+			GetDecisionsL(*upsDb, *filter, iCancel, recordList);
 			
 			TInt recNum;
 			recNum = recordList.Count();
 			if(recNum)
-				{
-				CleanupClosePushL(recordList);
+				{				
 				OpenDecisionFileL(EFileWrite);
 			
 				for(TInt i=0; i<recNum; ++i)
 					{
 					WriteDecisionL(*recordList[i]);
 					}
-				CloseDecisionFile();
-				CleanupStack::Pop(&recordList);
+				CloseDecisionFile();				
 				}
-			recordList.Close();
+			CleanupStack::PopAndDestroy(&recordList);			
 				
 			TInt expectedRecords;
 			if(EFalse == GetIntFromConfig(ConfigSection(),KExpectedRecords,expectedRecords))