FCL/sf/os/kernelhwsrv: comparison kerneltest/f32test/server/t

equal deleted inserted replaced

-:94f2adf59133
+:b2826f67641f
 			test.Printf(_L("iLockedSegmentCount %d...\n"), fileCacheStats.iLockedSegmentCount);
 		test(fileCacheStats.iLockedSegmentCount >= maxLockedSegmentCount);
 		maxLockedSegmentCount = Max(maxLockedSegmentCount, fileCacheStats.iLockedSegmentCount);
 		// wrap to start of file
-		if (pos >= gFileCacheConfig.iCacheSize)
+		if (pos >= gFileCacheConfig.iCacheSize || pos >= KBufSize)
 			pos = 0;
 		}
 	timer.Close();
 	test(fileCacheStats.iLockedSegmentCount > 0);
 	test_Value(r, r==KErrArgument);
 	r = f.Open(TheFs, testFile, EFileRead | EFileWriteBuffered | EFileWriteDirectIO);
 	test_Value(r, r==KErrArgument);
 	//**********************************
 	// Test that continuously appending to a file yields the correct size...
-	// NB: Must have lock failure more ON in debug mode for this test to pass
+	// NB: Must have lock failure mode ON in debug mode for this test to pass
 	//**********************************
 	test.Next(_L("Test appending to a file & checking the file size..."));
 	gBufPtr.SetLength(KBufSize);
-	r = f.Replace(TheFs, testFile, EFileWrite | EFileWriteBuffered);
-	test_KErrNone(r);
 	const TInt KWriteLen = KSegmentSize+1;
 	writePtr.Set(gBuf->Des().Ptr(), KWriteLen);
 #if defined(_DEBUG) || defined(_DEBUG_RELEASE)
 	r = controlIo(TheFs, gDrive, KControlIoFileCacheStats, fileCacheStats);
 #endif
 	TInt fileSize = 0;
 	for (TInt i=0; i<4; i++)
 		{
+		r = f.Replace(TheFs, testFile, EFileWrite | EFileWriteBuffered);
+		test_KErrNone(r);
 		fileSize = 0;
 		r = f.SetSize(fileSize);
 		test_KErrNone(r);
 		for (pos = 0; pos < KMaxFileSize; )
 			{
 				break;
 				}
 #endif
 			}
+		// Close & delete the file after filling it - to ensure all pages are decomitted
+		// otherwise we may never again get a simulated lock failure
+		r = f.Flush();
+		test_KErrNone(r);
+		f.Close();
+		r = TheFs.Delete(testFile);
+		test_KErrNone(r);
 		}
 #if defined(_DEBUG) || defined(_DEBUG_RELEASE)
 	test(writeThroughWithDirtyDataCountNew > writeThroughWithDirtyDataCountOld);
 #endif

changeset 297	b2826f67641f
parent 176	af6ec97d9189