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

equal deleted inserted replaced

-:ef2a444a7410
+:b3a1d9898418
 TFullName name;
 TInt r;
 for(TInt i=EDriveA;i<KMaxDrives;++i)
 {
 r=TheFs.FileSystemName(name,i);
-test(r==KErrNone || r==KErrNotFound);
+test_Value(r, r == KErrNone || r==KErrNotFound);
 TChar c;
 r=RFs::DriveToChar(i,c);
-test(r==KErrNone);
+test_KErrNone(r);
 if(name.Length())
 test.Printf(_L("File System Name on drive %c is %S\n"),(char)c,&name);
 else
 test.Printf(_L("No file system on drive %c\n"),(char)c);
 }
 if (aDrive==EDriveC) // ??? Can't test on C: - see below
 return;
 TInt r;
 TFullName oldSess, newSess;
 r=TheFs.SessionPath(oldSess);
-test(r==KErrNone);
+test_KErrNone(r);
 TChar c;
 r=TheFs.DriveToChar(aDrive,c);
-test(r==KErrNone);
+test_KErrNone(r);
 newSess.Append(c);
 newSess.Append(':');
 newSess.Append('\\');
 TBuf<128> b;
 TDriveInfo di;
 r=TheFs.Drive(di,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 b.Format(_L("Test dismounting of test file system on %c: (DrvAtt:%x MedAtt:%x)"),(TUint)c,di.iDriveAtt,di.iMediaAtt);
 test.Next(b);
 // Test cannot dismount on rom drive
 test.Next(_L("Test cannot dismount on Rom drive"));
 TFullName zName;
 r=TheFs.FileSystemName(zName,EDriveZ);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.DismountFileSystem(zName,EDriveZ);
 test.Printf(_L("r=%d"),r);
 // NB if paging is enabled on a ROFS partition which is part of the composite file system then the
 // likelihood is that there will be a at least one file clamped: in this case there error will be KErrInUse
-test(r==KErrAccessDenied || r==KErrInUse);
+test_Value(r, r == KErrAccessDenied || r==KErrInUse);
 // Test cannot dismount on wrong drive
 test.Next(_L("Test cannot dismount on wrong drive"));
 r=TheFs.DismountFileSystem(aFs,EDriveA);
-test(r==KErrNotReady);
+test_Value(r, r == KErrNotReady);
 // Test cannot dismount with wrong name
 test.Next(_L("Test cannot dismount with wrong file system name"));
 r=TheFs.DismountFileSystem(_L("abc"),aDrive);
-test(r==KErrNotFound);
+test_Value(r, r == KErrNotFound);
 // Test cannot dismount with a file open
 test.Next(_L("Test cannot dismount with a file open"));
 r=TheFs.SetSessionPath(newSess);
 RFile file;
 r=file.Replace(TheFs,_L("abc"),EFileShareAny);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.SessionPath(newSess);
 TBool open;
 r=TheFs.IsFileOpen(_L("abc"),open);
-test(r==KErrNone);
+test_KErrNone(r);
 test(open);
 r=TheFs.DismountFileSystem(aFs,aDrive);
-test(r==KErrInUse);
+test_Value(r, r == KErrInUse);
 file.Close();
 // Now test dismount works
 test.Next(_L("Test dismounts OK"));
 r=TheFs.DismountFileSystem(aFs,aDrive);
 test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
 TFullName n;
 r=TheFs.FileSystemName(n,aDrive);
-test(r==KErrNone || r==KErrNotFound);
+test_Value(r, r == KErrNone || r==KErrNotFound);
 test(!n.Length());
 r=file.Replace(TheFs,_L("abc"),EFileShareAny);
-test(r==KErrNotReady);
+test_Value(r, r == KErrNotReady);
 file.Close();
 r=TheFs.MountFileSystem(aFs,aDrive);
 if(r!=KErrNone)
 {
 test.Printf(_L("error = %d\n"),r);
 test(EFalse);
 }
 r=TheFs.FileSystemName(n,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test(n.Compare(aFs)==0);
 r=file.Replace(TheFs,_L("abc"),EFileShareAny); // ??? bang
-test(r==KErrNone);
+test_KErrNone(r);
 file.Close();
 r=TheFs.SetSessionPath(oldSess);
-test(r==KErrNone);
+test_KErrNone(r);
 }
 static void TestDismountFileSystem(TInt aDrive)
 {
 TInt r;
 TFullName name;
 r=TheFs.FileSystemName(name,aDrive);
-test(r==KErrNone || r==KErrNotFound);
+test_Value(r, r == KErrNone || r==KErrNotFound);
 if(name.Length())
 CheckDismount(name,aDrive);
 }
 #if defined(__EPOC32__)
 //
 {
 TBuf<64> b;
 TChar c;
 TInt r=TheFs.DriveToChar(aDrive,c);
-test(r==KErrNone);
+test_KErrNone(r);
 TDriveInfo di;
 r=TheFs.Drive(di,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 b.Format(_L("Test mounting of test file system on %c: (DrvAtt:%x MedAtt:%x)"),(TUint)c,di.iDriveAtt,di.iMediaAtt);
 test.Next(b);
 test.Next(_L("Test mounting of test file system"));
 r=TheFs.AddFileSystem(_L("T_TFSYS"));
 TFullName oldFs;
 r=TheFs.FileSystemName(oldFs,aDrive);
 //  TFileName oldFs;
 //  r=TheFs.FileSystemName(oldFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.DismountFileSystem(oldFs,aDrive);
 if(r!=KErrNone)
 {
 test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
 r=TheFs.MountFileSystem(_L("Test"),aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 TFileName newFs;
 r=TheFs.FileSystemName(newFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test(newFs.Compare(_L("Test"))==0);
 // Check attributes
 TDriveInfo info;
 r=TheFs.Drive(info,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test.Printf(_L("iType=%d,iConnectionBusType=%d,iDriveAtt=%x,iMediaAtt=%x\n"),(TUint)info.iType,\
 (TUint)info.iConnectionBusType,info.iDriveAtt,info.iMediaAtt);
 //Try to remove filesystem without dismounting.
 {
 test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 r=TheFs.FileSystemName(newFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test(newFs.Compare(_L("Test"))==0);
 r=TheFs.DismountFileSystem(newFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.MountFileSystem(oldFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 }
 #endif
 static void TestMountInvalidDrive()
 //
 _LIT(KFsNm, "ELOCAL");
 #endif
 r = TheFs.AddFileSystem(KFsNm);
 test.Printf(_L("afs: r = %d\n"), r);
-test(r == KErrNone || r == KErrAlreadyExists);
+test_Value(r, r == KErrNone || r == KErrAlreadyExists);
 test.Next(_L("mounting FAT on drive R"));
 r = TheFs.MountFileSystem(KFileSystemName_FAT, EDriveR);
-test(r == KErrArgument);
+test_Value(r, r == KErrArgument);
 test.End();
 }
 // Additional step for INC083446: Corrupted miniSD not detected as corrupted by phone
 return;
 TBuf<64> b;
 TChar c;
 TInt r=TheFs.DriveToChar(aDrive,c);
-test(r==KErrNone);
+test_KErrNone(r);
 TDriveInfo di;
 r=TheFs.Drive(di,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 b.Format(_L("Test mounting of test file system on %c: (DrvAtt:%x MedAtt:%x)"),(TUint)c,di.iDriveAtt,di.iMediaAtt);
 test.Next(b);
 test.Next(_L("Test mounting of test file system"));
 r=TheFs.AddFileSystem(_L("T_TFSYS2"));
 test(EFalse);
 }
 TFullName oldFs;
 r=TheFs.FileSystemName(oldFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.DismountFileSystem(oldFs,aDrive);
 if(r!=KErrNone)
 {
 test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
 r=TheFs.MountFileSystem(_L("Test2"),aDrive);
-test(r == KErrCorrupt);
+test_Value(r, r == KErrCorrupt);
 TFileName newFs;
 r=TheFs.FileSystemName(newFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test(newFs.Compare(_L("Test2"))==0);
 // Get the number of remounts by checking the volume attributes -
 // T_TFSYS2 hijacks the iBattery member to report back the number of times MountL() has been called
 TDriveInfo info;
 TInt remounts;
 r=TheFs.Drive(info,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test.Printf(_L("iType=%d,iBattery=%d,iDriveAtt=%x,iMediaAtt=%x\n"),(TUint)info.iType,\
 (TUint)info.iBattery,info.iDriveAtt,info.iMediaAtt);
 remounts = (TInt) info.iBattery;
 test.Printf(_L("Initial remounts = %d"), remounts);
 for (entryAttempts=0; entryAttempts < KEntryAttempts; entryAttempts++)
 {
 TEntry entry;
 _LIT(KNonExistantFilename, "NONEXISTANT_FILENAME.DLL");
 r = TheFs.Entry(KNonExistantFilename, entry);
-test(r == KErrCorrupt);
+test_Value(r, r == KErrCorrupt);
 }
 r=TheFs.Drive(info,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test.Printf(_L("iType=%d,iBattery=%d,iDriveAtt=%x,iMediaAtt=%x\n"),(TUint)info.iType,\
 (TUint)info.iBattery,info.iDriveAtt,info.iMediaAtt);
 remounts = (TInt) info.iBattery;
 test.Printf(_L("Remounts = %d"), remounts);
 test(remounts ==  KMaxMountFailures);
 for (entryAttempts=0; entryAttempts < KEntryAttempts; entryAttempts++)
 {
 TEntry entry;
 _LIT(KNonExistantFilename, "NONEXISTANT_FILENAME.DLL");
 r = TheFs.Entry(KNonExistantFilename, entry);
-test(r == KErrCorrupt);
+test_Value(r, r == KErrCorrupt);
 }
 r=TheFs.Drive(info,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test.Printf(_L("iType=%d,iBattery=%d,iDriveAtt=%x,iMediaAtt=%x\n"),(TUint)info.iType,\
 (TUint)info.iBattery,info.iDriveAtt,info.iMediaAtt);
 remounts = (TInt) info.iBattery;
 test.Printf(_L("Remounts = %d"), remounts);
 test(remounts ==  KMaxMountFailures * 2);
 r=TheFs.DismountFileSystem(newFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.MountFileSystem(oldFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.RemoveFileSystem(_L("Test2"));
 if(r!=KErrNone)
 {
 test.Printf(_L("error=%d"),r);
 TInt  nRes;
 const TInt currDrvNum=CurrentDrive();
 TDriveInfo drvInfo;
 nRes=TheFs.Drive(drvInfo, currDrvNum);
-test(nRes==KErrNone);
+test_KErrNone(nRes);
 if(drvInfo.iDriveAtt & (KDriveAttRom | KDriveAttRedirected | KDriveAttSubsted))
 {
 test.Printf(_L("Can't test on this drive!\n"));
 return;
 TDriveInfo drvInfo;
 if(KErrNone==TheFs.Drive(drvInfo, drvNum) && drvInfo.iType==EMediaNotPresent)
 {
 // found a non-extant drive, test it...
 nRes = TheFs.GetMediaSerialNumber(serNum, drvNum);
-test(nRes == KErrNotReady);
+test_Value(nRes, nRes == KErrNotReady);
 break;
 }
 }
 }
 //-- make directory, which will be substituted ad a drive
 substPath.Format(_L("%c:\\SubstDrv1\\"), (TUint8)'A'+currDrvNum);
 MakeDir(substPath);
 nRes = TheFs.SetSubst(substPath, KSubstDrv);
-test(nRes == KErrNone);
+test_KErrNone(nRes);
 //-- an attempt to obtain Media Serial Number on a substed drive shall result in KErrNotSupported
 nRes = TheFs.GetMediaSerialNumber(serNum, KSubstDrv);
-test(nRes == KErrNotSupported);
+test_Value(nRes, nRes == KErrNotSupported);
 //-- delete substed drive
 nRes = TheFs.SetSubst(_L(""), KSubstDrv);
-test(nRes == KErrNone);
+test_KErrNone(nRes);
 }
 //----------------------------------------------------------------------------------------------
 //! @SYMTestCaseID      PBASE-t_fsys-0317
 r = TheFs.FileSystemName(fsName, i);
 if (r == KErrNone)
 {
 test.Printf(_L("Tested on drive: %c.\n"), (char)(i+'A'));
 r=TheFs.Drive(driveInfo, i);
-test(r==KErrNone);
+test_KErrNone(r);
 if (driveInfo.iType==EMediaNotPresent)
 {
 test.Printf(_L("The media is not present.\n"));
 r = TheFs.QueryVolumeInfoExt(i, EFileSystemSubType, subName);
-test(r == KErrNone || r == KErrNotReady);
+test_Value(r, r == KErrNone || r == KErrNotReady);
 }
 else if (driveInfo.iType==EMediaCdRom)
 {
 test.Printf(_L("CD ROM with no media will report not ready!\n"));
 r = TheFs.QueryVolumeInfoExt(i, EFileSystemSubType, subName);
-test(r == KErrNotReady);
+test_Value(r, r == KErrNotReady);
 }
 else
 {
 r = TheFs.QueryVolumeInfoExt(i, EFileSystemSubType, subName);
 test_KErrNone(r);
 //-- test EIsDriveSync command
 r = TheFs.QueryVolumeInfoExt(i, EIsDriveSync, fDrvSyncBuf);
-test(r == KErrNone);
+test_KErrNone(r);
 if(fDrvSyncBuf())
 test.Printf(_L("The drive is Synchronous.\n"));
 else
 test.Printf(_L("The drive is Asynchronous.\n"));
 //-----------------
 // if Fat, testing returning sub type name
 if (fsName.CompareF(KFileSystemName_FAT)==0)
 {
-test(r == KErrNone);
+test_KErrNone(r);
 test(subName().CompareF(KFSSubType_FAT12)==0 ||
 subName().CompareF(KFSSubType_FAT16)==0 ||
 subName().CompareF(KFSSubType_FAT32)==0);
 continue;
 }
 // if Lffs, testing returning file system name
 if (fsName.CompareF(_L("Lffs"))==0)
 {
-test(r == KErrNone);
+test_KErrNone(r);
 test(subName().CompareF(_L("Lffs"))==0);
 continue;
 }
 // if rofs, testing returning file system name
 if (fsName.CompareF(_L("rofs"))==0)
 {
-test(r == KErrNone);
+test_KErrNone(r);
 test(subName().CompareF(_L("rofs"))==0);
 continue;
 }
 // if Composite, testing returning file system name
 if (fsName.CompareF(_L("Composite"))==0)
 {
-test(r == KErrNone);
+test_KErrNone(r);
 test(subName().CompareF(_L("Composite"))==0);
 continue;
 }
 // else
-test(r == KErrNone);
+test_KErrNone(r);
 test(subName().Length()!=0);
 }
 }
 }
 if (r == KErrNone)
 {
 test.Printf(_L("Tested on drive: %c.\n"), (char)(i+'A'));
 r=TheFs.Drive(driveInfo, i);
-test(r==KErrNone);
+test_KErrNone(r);
 // if no media present
 if (driveInfo.iType==EMediaNotPresent)
 {
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
-test(r == KErrNone || r == KErrNotReady);
+test_Value(r, r == KErrNone || r == KErrNotReady);
 }
 else if (driveInfo.iType==EMediaCdRom)
 {
 test.Printf(_L("CD ROM with no media!\n"));
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
-test(r == KErrNone || r == KErrNotReady);
+test_Value(r, r == KErrNone || r == KErrNotReady);
 }
 else
 {
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
 test(KErrNone == r);
 drive.Disconnect();
 }
 }
 TPckg<TLocalDriveCapsV7> capsPckg(DriveCapsV7);
 r=drive.Caps(capsPckg);
-test(r==KErrNone);
+test_KErrNone(r);
 drive.Disconnect();
 if(DriveCapsV7.iObjectModeSize == 0)
 {
 test(ioInfo().iClusterSize == 512);
 continue;
 r = TheFs.FileSystemName(fsName, i);
 if (r == KErrNone)
 {
 test.Printf(_L("Tested on drive: %c.\n"), (char)(i+'A'));
 r=TheFs.Drive(driveInfo, i);
-test(r==KErrNone);
+test_KErrNone(r);
 // if no media present
 if (driveInfo.iType==EMediaNotPresent)
 {
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
-test(r == KErrNone || r == KErrNotReady);
+test_Value(r, r == KErrNone || r == KErrNotReady);
 }
 else if (driveInfo.iType==EMediaCdRom)
 {
 test.Printf(_L("CD ROM with no media will report not ready!\n"));
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
-test(r == KErrNotReady);
+test_Value(r, r == KErrNotReady);
 }
 else
 {
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
 test(KErrNone == r);
 drive.Disconnect();
 }
 }
 TPckg<TLocalDriveCapsV7> capsPckg(DriveCapsV7);
 r=drive.Caps(capsPckg);
-test(r==KErrNone);
+test_KErrNone(r);
 if ((fsName.CompareF(_L("Lffs"))==0) && (DriveCapsV7.iObjectModeSize != 0))
 {
 test(ioInfo().iBlockSize == (TInt) DriveCapsV7.iObjectModeSize);
 continue;
 }
 if (r == KErrNone)
 {
 test.Printf(_L("Tested on drive: %c.\n"), (char)(i+'A'));
 r = TheFs.QueryVolumeInfoExt(i, EFileSystemSubType, subName);
 r1 = TheFs.FileSystemSubType(i, subName1);
-test(r==r1);
+test_Value(r, r == r1);
 if (subName().Length())
 {
 test(subName().CompareF(subName1)==0);
 }
 else
 if (r == KErrNone)
 {
 test.Printf(_L("Tested on drive: %c.\n"), (char)(i+'A'));
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
 r1 = TheFs.VolumeIOParam(i, ioInfo1);
-test(r==r1);
+test_Value(r, r == r1);
 test(ioInfo().iBlockSize == ioInfo1.iBlockSize);
 test(ioInfo().iClusterSize == ioInfo1.iClusterSize);
 test(ioInfo().iRecReadBufSize == ioInfo1.iRecReadBufSize);
 test(ioInfo().iRecWriteBufSize == ioInfo1.iRecWriteBufSize);
 }
 test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 TFSName oldFs;
 r = TheFs.FileSystemName(oldFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r = TheFs.DismountFileSystem(oldFs,aDrive);
 if (r != KErrNone)
 {
 test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
 r = TheFs.MountFileSystem(_L("Test3"),aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 TFSName newFs;
 r = TheFs.FileSystemName(newFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 test(newFs.Compare(_L("Test3"))==0);
 // Sub type name query:
 TPckgBuf<TFSName> subNameP;
 r = TheFs.QueryVolumeInfoExt(aDrive, EFileSystemSubType, subNameP);
-test(r==KErrNone);
+test_KErrNone(r);
 test(subNameP() == _L("Test3SubType"));
 // Cluster size querys:
 TPckgBuf<TVolumeIOParamInfo> ioInfoP;
 r = TheFs.QueryVolumeInfoExt(aDrive, EIOParamInfo, ioInfoP);
-test(r==KErrNone);
+test_KErrNone(r);
 test(ioInfoP().iClusterSize==1024);
 // Mount the original file system back
 r=TheFs.DismountFileSystem(newFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.MountFileSystem(oldFs,aDrive);
-test(r==KErrNone);
+test_KErrNone(r);
 r=TheFs.RemoveFileSystem(_L("Test3"));
 if(r!=KErrNone)
 {
 test.Printf(_L("error=%d"),r);
 RFile file;
 //-- 2. open this file
 nRes = file.Open(TheFs, KFile, EFileRead);
 test_KErrNone(nRes);
+const TInt drvNumber = CurrentDrive();
 //-- 2.1 try to dismount the FS, it must fail because of the opened object.
 TBuf<40> fsName;
-nRes = TheFs.FileSystemName(fsName, CurrentDrive());
+nRes = TheFs.FileSystemName(fsName, drvNumber);
 test_KErrNone(nRes);
-nRes = TheFs.DismountFileSystem(fsName, CurrentDrive());
+nRes = TheFs.DismountFileSystem(fsName, drvNumber);
-test(nRes == KErrInUse);
+test_Value(nRes, nRes == KErrInUse);
+// Flag from locmedia.h to simulate ejecting and re-inserting the media.
+const TUint KMediaRemountForceMediaChange = 0x00000001;
+TRequestStatus changeStatus;
+TheFs.NotifyChange(ENotifyAll, changeStatus);
+TDriveInfo driveInfo;
 //-- 3. forcedly remount the drive
-nRes = TheFs.RemountDrive(CurrentDrive());
+nRes = TheFs.RemountDrive(drvNumber, NULL, KMediaRemountForceMediaChange);
 if(nRes == KErrNotSupported)
-{//-- this feature is not supported and the test is inconsistent.
+	{//-- this feature is not supported and the test is inconsistent.
 test.Printf(_L("RemountDrive() is not supported, the test is inconsistent!"));
 //-- remounting must work at least on MMC drives
-const TBool isFAT = Is_Fat(TheFs, CurrentDrive());
+const TBool isFAT = Is_Fat(TheFs, drvNumber);
-TDriveInfo  driveInfo;
+nRes = TheFs.Drive(driveInfo, drvNumber);
-nRes = TheFs.Drive(driveInfo, CurrentDrive());
 test_KErrNone(nRes);
-test(!isFAT || (!(driveInfo.iDriveAtt & KDriveAttRemovable)));
+test_Value(driveInfo.iDriveAtt, !isFAT || (!(driveInfo.iDriveAtt & KDriveAttRemovable)));
+	}
-}
 else
-{
+	{
-test_KErrNone(nRes);
+		test_Value(nRes, nRes == KErrNotReady || nRes == KErrNone);
-}
+		//-- 3.1 wait for media change to complete
-User::After(500*K1mSec);
+		do
+			{
+			// Waiting for media change...
+			User::WaitForRequest(changeStatus);
+			nRes = TheFs.Drive(driveInfo, drvNumber);
+			TheFs.NotifyChange(ENotifyAll, changeStatus);
+			}
+		while (nRes == KErrNotReady);
+		test_KErrNone(nRes);
+		User::After(1000*K1mSec);	// Wait 1 sec (needed by certain platforms)
+	}
+TheFs.NotifyChangeCancel(changeStatus);
 //-- 4. read this file. The FS will be remounted and the read must be OK.
 TBuf8<40> buf;
 nRes = file.Read(0, buf, 30);
 test_KErrNone(nRes);

changeset 109	b3a1d9898418
parent 33	0173bcd7697c
child 254	1560c419b176