diff -r ccab7f1f8266 -r 67c6ff54ec25 stif/TestEngine/src/TestReport.cpp --- a/stif/TestEngine/src/TestReport.cpp Mon May 03 13:58:41 2010 +0300 +++ b/stif/TestEngine/src/TestReport.cpp Fri May 14 17:25:03 2010 +0300 @@ -194,7 +194,7 @@ ------------------------------------------------------------------------------- */ -void CTestReport::ConstructL( TTestReportSettings& aTestReportSettings ) +void CTestReport::ConstructL( CTestReportSettings& aTestReportSettings ) { // Create summary for all test cases _LIT( KName, "All test cases" ); @@ -248,28 +248,24 @@ { User::LeaveIfError( iFile.Replace( iFs, pathAndFile, - EFileWrite | EFileStreamText | EFileShareAny ) ); + EFileWrite | EFileStreamText | EFileShareExclusive ) ); } else { - TBool isOpen( EFalse ); - TInt fileOpen = iFs.IsFileOpen( pathAndFile, isOpen ); + TInt fileOpen = iFile.Open( iFs, + pathAndFile, + EFileWrite | EFileStreamText | EFileShareAny ); if( fileOpen == KErrNotFound ) { User::LeaveIfError( iFile.Create( iFs, pathAndFile, - EFileWrite | EFileStreamText | EFileShareAny ) ); + EFileWrite | EFileStreamText | EFileShareExclusive ) ); } else if( fileOpen == KErrNone ) { - User::LeaveIfError( - iFile.Open( iFs, - pathAndFile, - EFileWrite | EFileStreamText | EFileShareAny ) ); TInt endPosOfFile = 0; User::LeaveIfError( iFile.Seek( ESeekEnd, endPosOfFile ) ); - } else { @@ -307,7 +303,7 @@ ------------------------------------------------------------------------------- */ -CTestReport* CTestReport::NewL( TTestReportSettings& aTestReportSettings, +CTestReport* CTestReport::NewL( CTestReportSettings& aTestReportSettings, const TTestReportMode aReportMode ) { CTestReport* self = new ( ELeave ) CTestReport( aReportMode ); @@ -339,6 +335,9 @@ */ CTestReport::~CTestReport() { + iTestModulesVersionsInfo.ResetAndDestroy(); + iTestModulesVersionsInfo.Close(); + // Reset and destroy arrays iTestSummaries.ResetAndDestroy(); delete iTotalSummary;