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

equal deleted inserted replaced

-:345b1ca54e88
+:039a3e647356
 #define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <f32file_private.h>
 #include <e32test.h>
-#include <e32math.h>
 #include "t_server.h"
 #include "fat_utils.h"
 #include "filesystem_fat.h"
 using namespace Fat_Test_Utils;
 RTest test(_L("T_FSYS"));
-static TInt64   gRndSeed;
-_LIT(KTestFsy,  "T_TFSYS");
-_LIT(KTestFsy2, "T_TFSYS2");
-_LIT(KTestFsy3, "T_TFSYS3");
-_LIT(KTestFsName,  "Test");
-_LIT(KTestFsName2, "Test2");
-_LIT(KTestFsName3, "Test3");
-//---------------------------------------------------
-void InitGlobals()
-{
-//-- initialise random generator
-gRndSeed = 0xf73c1ab;
-Math::Rand(gRndSeed);
-}
-//---------------------------------------------------
-void DestroyGlobals()
-{
-}
-//---------------------------------------------------
 static void TestFileSystemNames()
 {
-test.Next(_L("TestFileSystemNames(). Read file system names for all drives\n"));
+test.Next(_L("Read file system names for all drives"));
 TFullName name;
-TBuf<60>  buf;
+TInt r;
-TInt nRes;
+for(TInt i=EDriveA;i<KMaxDrives;++i)
+{
-TDriveList drvList;
+r=TheFs.FileSystemName(name,i);
-nRes = TheFs.DriveList(drvList);
+test(r==KErrNone || r==KErrNotFound);
-test_KErrNone(nRes);
+TChar c;
+r=RFs::DriveToChar(i,c);
-for(TInt i=0; i<KMaxDrives; ++i)
+test(r==KErrNone);
-{
+if(name.Length())
-buf.Format(_L("drv %C: att:0x%02x"), 'A'+i, drvList[i]);
+test.Printf(_L("File System Name on drive %c is %S\n"),(char)c,&name);
-nRes = TheFs.FileSystemName(name, i);
-test_Value(nRes, nRes == KErrNone || nRes==KErrNotFound);
-if(nRes == KErrNone)
-{
-buf.AppendFormat(_L(" Mounted FS:%S"), &name);
-}
 else
-{
+test.Printf(_L("No file system on drive %c\n"),(char)c);
-buf.Append(_L(" Mounted FS:"));
+}
 }
-buf.Append(_L("\n"));
-test.Printf(buf);
-}
-}
-//---------------------------------------------------
 static void CheckDismount(TDesC& aFs,TInt aDrive)
 {
 if (aDrive==EDriveC) // ??? Can't test on C: - see below
 return;
 TInt r;
 TFullName oldSess, newSess;
 r=TheFs.SessionPath(oldSess);
-test_KErrNone(r);
+test(r==KErrNone);
 TChar c;
 r=TheFs.DriveToChar(aDrive,c);
-test_KErrNone(r);
+test(r==KErrNone);
 newSess.Append(c);
 newSess.Append(':');
 newSess.Append('\\');
 TBuf<128> b;
 TDriveInfo di;
 r=TheFs.Drive(di,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-b.Format(_L("Test dismounting of test file system on %c: (DrvAtt:%x MedAtt:%x)\n"),(TUint)c,di.iDriveAtt,di.iMediaAtt);
+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\n"));
+test.Next(_L("Test cannot dismount on Rom drive"));
 TFullName zName;
 r=TheFs.FileSystemName(zName,EDriveZ);
-test_KErrNone(r);
+test(r==KErrNone);
 r=TheFs.DismountFileSystem(zName,EDriveZ);
-test.Printf(_L("r=%d\n"),r);
+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_Value(r, r == KErrAccessDenied || r==KErrInUse);
+test(r==KErrAccessDenied || r==KErrInUse);
 // Test cannot dismount on wrong drive
-test.Next(_L("Test cannot dismount on wrong drive\n"));
+test.Next(_L("Test cannot dismount on wrong drive"));
 r=TheFs.DismountFileSystem(aFs,EDriveA);
-test_Value(r, r == KErrNotReady);
+test(r==KErrNotReady);
 // Test cannot dismount with wrong name
-test.Next(_L("Test cannot dismount with wrong file system name\n"));
+test.Next(_L("Test cannot dismount with wrong file system name"));
 r=TheFs.DismountFileSystem(_L("abc"),aDrive);
-test_Value(r, r == KErrNotFound);
+test(r==KErrNotFound);
 // Test cannot dismount with a file open
-test.Next(_L("Test cannot dismount with a file open\n"));
+test.Next(_L("Test cannot dismount with a file open"));
 r=TheFs.SetSessionPath(newSess);
 RFile file;
 r=file.Replace(TheFs,_L("abc"),EFileShareAny);
-test_KErrNone(r);
+test(r==KErrNone);
 r=TheFs.SessionPath(newSess);
 TBool open;
 r=TheFs.IsFileOpen(_L("abc"),open);
-test_KErrNone(r);
+test(r==KErrNone);
 test(open);
 r=TheFs.DismountFileSystem(aFs,aDrive);
-test_Value(r, r == KErrInUse);
+test(r==KErrInUse);
 file.Close();
 // Now test dismount works
-test.Next(_L("Test dismounts OK\n"));
+test.Next(_L("Test dismounts OK"));
 r=TheFs.DismountFileSystem(aFs,aDrive);
 if(r!=KErrNone)
 {
-test.Printf(_L("Error = %d\n"),r);
+test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
 TFullName n;
 r=TheFs.FileSystemName(n,aDrive);
-test_Value(r, r == KErrNone || r==KErrNotFound);
+test(r==KErrNone || r==KErrNotFound);
 test(!n.Length());
 r=file.Replace(TheFs,_L("abc"),EFileShareAny);
-test_Value(r, r == KErrNotReady);
+test(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_KErrNone(r);
+test(r==KErrNone);
 test(n.Compare(aFs)==0);
 r=file.Replace(TheFs,_L("abc"),EFileShareAny); // ??? bang
-test_KErrNone(r);
+test(r==KErrNone);
 file.Close();
 r=TheFs.SetSessionPath(oldSess);
-test_KErrNone(r);
+test(r==KErrNone);
 }
 static void TestDismountFileSystem(TInt aDrive)
 {
-test.Next(_L("TestDismountFileSystem()\n"));
 TInt r;
 TFullName name;
 r=TheFs.FileSystemName(name,aDrive);
-test_Value(r, r == KErrNone || r==KErrNotFound);
+test(r==KErrNone || r==KErrNotFound);
 if(name.Length())
 CheckDismount(name,aDrive);
 }
-//---------------------------------------------------
+#if defined(__EPOC32__)
+static void TestFileSystem(TInt aDrive)
 //
 // Mount a new CTestFileSystem on the drive under test
 //
-static void TestFileSystem(TInt aDrive)
+{
-{
-test.Next(_L("TestFileSystem()\n"));
-if(Is_Win32(TheFs, aDrive))
-{
-test.Printf(_L("Can't test on a simulated drive, skipping!\n"));
-return;
-}
 TBuf<64> b;
 TChar c;
 TInt r=TheFs.DriveToChar(aDrive,c);
-test_KErrNone(r);
+test(r==KErrNone);
 TDriveInfo di;
 r=TheFs.Drive(di,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-b.Format(_L("Test mounting of test file system on %c: (DrvAtt:%x MedAtt:%x)\n"),(TUint)c,di.iDriveAtt,di.iMediaAtt);
+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\n"));
+test.Next(_L("Test mounting of test file system"));
-r=TheFs.AddFileSystem(KTestFsy);
+r=TheFs.AddFileSystem(_L("T_TFSYS"));
 if(r!=KErrNone && r!=KErrAlreadyExists)
 {
-test.Printf(_L("error=%d\n"),r);
+test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 TFullName oldFs;
 r=TheFs.FileSystemName(oldFs,aDrive);
 //  TFileName oldFs;
 //  r=TheFs.FileSystemName(oldFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 r=TheFs.DismountFileSystem(oldFs,aDrive);
 if(r!=KErrNone)
 {
-test.Printf(_L("Error = %d\n"),r);
+test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
-r=TheFs.MountFileSystem(KTestFsName,aDrive);
+r=TheFs.MountFileSystem(_L("Test"),aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 TFileName newFs;
 r=TheFs.FileSystemName(newFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-test(newFs.Compare(KTestFsName)==0);
+test(newFs.Compare(_L("Test"))==0);
 // Check attributes
 TDriveInfo info;
 r=TheFs.Drive(info,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-test.Printf(_L("iType=%d,iConnectionBusType=%d,iDriveAtt=%x,iMediaAtt=%x\n"),(TUint)info.iType, (TUint)info.iConnectionBusType,info.iDriveAtt,info.iMediaAtt);
+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.
-r=TheFs.RemoveFileSystem(KTestFsName);
+r=TheFs.RemoveFileSystem(_L("Test"));
 if(r!=KErrInUse)
 {
-test.Printf(_L("error=%d\n"),r);
+test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 r=TheFs.FileSystemName(newFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-test(newFs.Compare(KTestFsName)==0);
+test(newFs.Compare(_L("Test"))==0);
 r=TheFs.DismountFileSystem(newFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 r=TheFs.MountFileSystem(oldFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 }
+#endif
-//---------------------------------------------------
 static void TestMountInvalidDrive()
-{
+//
-test.Next(_L("TestMountInvalidDrive(). Try mounting FS on an invalid drive\n"));
+// Attempt to mount FAT on non-local drive
+{
-//-- 1. find an invalid drive
+test.Start(_L("TestMountInvalidDrive"));
-TInt drv = 0;
-TDriveList drvList;
+TInt r;
-TInt nRes = TheFs.DriveList(drvList);
+test.Next(_L("Adding EFAT"));
-test_KErrNone(nRes);
+#ifdef __WINS__
+_LIT(KFsNm, "EFAT32");
-for(drv =0; drv<KMaxDrives; ++drv)
+#else
-{
+_LIT(KFsNm, "ELOCAL");
-if(!drvList[drv])
+#endif
-break;
-}
+r = TheFs.AddFileSystem(KFsNm);
+test.Printf(_L("afs: r = %d\n"), r);
-test.Printf(_L("Try mounting a test FS onto drive:%C:\n"), 'A'+drv);
+test(r == KErrNone || r == KErrAlreadyExists);
+test.Next(_L("mounting FAT on drive R"));
-nRes = TheFs.AddFileSystem(KTestFsy);
+r = TheFs.MountFileSystem(KFileSystemName_FAT, EDriveR);
-test_Value(nRes, nRes == KErrNone || nRes == KErrAlreadyExists);
+test(r == KErrArgument);
-nRes = TheFs.MountFileSystem(KTestFsName, drv);
+test.End();
-test_Value(nRes, nRes == KErrArgument);
 }
 // Additional step for INC083446: Corrupted miniSD not detected as corrupted by phone
 static void TestMountingBrokenMedia(TInt aDrive)
 //
 return;
 TBuf<64> b;
 TChar c;
 TInt r=TheFs.DriveToChar(aDrive,c);
-test_KErrNone(r);
+test(r==KErrNone);
 TDriveInfo di;
 r=TheFs.Drive(di,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-b.Format(_L("Test mounting of test file system on %c: (DrvAtt:%x MedAtt:%x)\n"),(TUint)c,di.iDriveAtt,di.iMediaAtt);
+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\n"));
+test.Next(_L("Test mounting of test file system"));
-r=TheFs.AddFileSystem(KTestFsy2);
+r=TheFs.AddFileSystem(_L("T_TFSYS2"));
 if(r!=KErrNone && r!=KErrAlreadyExists)
 {
-test.Printf(_L("error=%d\n"),r);
+test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 TFullName oldFs;
 r=TheFs.FileSystemName(oldFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 r=TheFs.DismountFileSystem(oldFs,aDrive);
 if(r!=KErrNone)
 {
-test.Printf(_L("Error = %d\n"),r);
+test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
-r=TheFs.MountFileSystem(KTestFsName2 ,aDrive);
+r=TheFs.MountFileSystem(_L("Test2"),aDrive);
-test_Value(r, r == KErrCorrupt);
+test(r == KErrCorrupt);
 TFileName newFs;
 r=TheFs.FileSystemName(newFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-test(newFs.Compare(KTestFsName2)==0);
+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_KErrNone(r);
+test(r==KErrNone);
 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\n"), remounts);
+test.Printf(_L("Initial remounts = %d"), remounts);
 // Make the file server attempt to remount the drive by looking for a non-existant DLL
 // The file server should setop trying to remount the driver after KMaxMountFailures attempts
 const TInt KMaxMountFailures = 3;   // copied from sf_drv.cpp
 const TInt KEntryAttempts = 10;
 for (entryAttempts=0; entryAttempts < KEntryAttempts; entryAttempts++)
 {
 TEntry entry;
 _LIT(KNonExistantFilename, "NONEXISTANT_FILENAME.DLL");
 r = TheFs.Entry(KNonExistantFilename, entry);
-test_Value(r, r == KErrCorrupt);
+test(r == KErrCorrupt);
 }
 r=TheFs.Drive(info,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 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\n"), remounts);
+test.Printf(_L("Remounts = %d"), remounts);
 test(remounts ==  KMaxMountFailures);
 // simulate a media change to reset failure count
 r = TheFs.RemountDrive(aDrive, NULL, 0);
 for (entryAttempts=0; entryAttempts < KEntryAttempts; entryAttempts++)
 {
 TEntry entry;
 _LIT(KNonExistantFilename, "NONEXISTANT_FILENAME.DLL");
 r = TheFs.Entry(KNonExistantFilename, entry);
-test_Value(r, r == KErrCorrupt);
+test(r == KErrCorrupt);
 }
 r=TheFs.Drive(info,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 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\n"), remounts);
+test.Printf(_L("Remounts = %d"), remounts);
 test(remounts ==  KMaxMountFailures * 2);
 r=TheFs.DismountFileSystem(newFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 r=TheFs.MountFileSystem(oldFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-r=TheFs.RemoveFileSystem(KTestFsName2);
+r=TheFs.RemoveFileSystem(_L("Test2"));
 if(r!=KErrNone)
 {
-test.Printf(_L("error=%d\n"),r);
+test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 }
 /**
 Testing obtaining media serial number for the substituted drives
 */
 static void TestSubstDriveMediaSerialNumber()
 {
-test.Next(_L("Test obtaining media serial number for the substituted drives\n"));
+test.Next(_L("Test obtaining media serial number for the substituted drives"));
 TInt  nRes;
 const TInt currDrvNum=CurrentDrive();
 TDriveInfo drvInfo;
 nRes=TheFs.Drive(drvInfo, currDrvNum);
-test_KErrNone(nRes);
+test(nRes==KErrNone);
 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_Value(nRes, nRes == KErrNotReady);
+test(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_KErrNone(nRes);
+test(nRes == KErrNone);
 //-- an attempt to obtain Media Serial Number on a substed drive shall result in KErrNotSupported
 nRes = TheFs.GetMediaSerialNumber(serNum, KSubstDrv);
-test_Value(nRes, nRes == KErrNotSupported);
+test(nRes == KErrNotSupported);
 //-- delete substed drive
 nRes = TheFs.SetSubst(_L(""), KSubstDrv);
-test_KErrNone(nRes);
+test(nRes == KErrNone);
 }
 //----------------------------------------------------------------------------------------------
 //! @SYMTestCaseID      PBASE-t_fsys-0317
 //! @SYMTestPriority        High
 //! @SYMTestStatus          Implemented
 //----------------------------------------------------------------------------------------------
 static void TestFileSystemSubTypeQuery()
 {
-test.Next(_L("Test querying sub type of the mounted file system\n"));
+test.Next(_L("Test querying sub type of the mounted file system"));
 TFSName fsName;
 TPckgBuf<TFSName> subName;
 TInt i, r;
 TDriveInfo driveInfo;
 TPckgBuf<TBool> fDrvSyncBuf;
 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_KErrNone(r);
+test(r==KErrNone);
 if (driveInfo.iType==EMediaNotPresent)
 {
 test.Printf(_L("The media is not present.\n"));
 r = TheFs.QueryVolumeInfoExt(i, EFileSystemSubType, subName);
-test_Value(r, r == KErrNone || r == KErrNotReady);
+test(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_Value(r, r == KErrNotReady);
+test(r == KErrNotReady);
 }
 else
 {
 r = TheFs.QueryVolumeInfoExt(i, EFileSystemSubType, subName);
 test_KErrNone(r);
 //-- test EIsDriveSync command
 r = TheFs.QueryVolumeInfoExt(i, EIsDriveSync, fDrvSyncBuf);
-test_KErrNone(r);
+test(r == KErrNone);
 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_KErrNone(r);
+test(r == KErrNone);
 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_KErrNone(r);
+test(r == KErrNone);
 test(subName().CompareF(_L("Lffs"))==0);
 continue;
 }
 // if rofs, testing returning file system name
 if (fsName.CompareF(_L("rofs"))==0)
 {
-test_KErrNone(r);
+test(r == KErrNone);
 test(subName().CompareF(_L("rofs"))==0);
 continue;
 }
 // if Composite, testing returning file system name
 if (fsName.CompareF(_L("Composite"))==0)
 {
-test_KErrNone(r);
+test(r == KErrNone);
 test(subName().CompareF(_L("Composite"))==0);
 continue;
 }
 // else
-test_KErrNone(r);
+test(r == KErrNone);
 test(subName().Length()!=0);
 }
 }
 }
 //! @SYMTestPriority        High
 //! @SYMTestStatus          Implemented
 //----------------------------------------------------------------------------------------------
 static void TestFileSystemClusterSizeQuery()
 {
-test.Next(_L("Test querying cluster size information of the mounted file system\n"));
+test.Next(_L("Test querying cluster size information of the mounted file system"));
 TFullName fsName;
 TPckgBuf<TVolumeIOParamInfo> ioInfo;
 TInt i, r;
 TDriveInfo driveInfo;
 for(i = EDriveA; i <= EDriveZ; ++i)
 if (r == KErrNone)
 {
 test.Printf(_L("Tested on drive: %c.\n"), (char)(i+'A'));
 r=TheFs.Drive(driveInfo, i);
-test_KErrNone(r);
+test(r==KErrNone);
 // if no media present
 if (driveInfo.iType==EMediaNotPresent)
 {
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
-test_Value(r, r == KErrNone || r == KErrNotReady);
+test(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_Value(r, r == KErrNone || r == KErrNotReady);
+test(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_KErrNone(r);
+test(r==KErrNone);
 drive.Disconnect();
 if(DriveCapsV7.iObjectModeSize == 0)
 {
 test(ioInfo().iClusterSize == 512);
 continue;
 //! @SYMTestPriority        High
 //! @SYMTestStatus          Implemented
 //----------------------------------------------------------------------------------------------
 static void TestMediaBlockSizeQuery()
 {
-test.Next(_L("Test querying block size information of the underlying media\n"));
+test.Next(_L("Test querying block size information of the underlying media"));
 #if defined(__WINS__)
-test.Printf(_L("This test case runs on hardware only\n"));
+test.Printf(_L("This test case runs on hardware only"));
 return;
 #else   // test runs on hardware only.
 TFSName fsName;
 TPckgBuf<TVolumeIOParamInfo> ioInfo;
 TInt i, r;
 TDriveInfo driveInfo;
 for(i = EDriveA; i <= EDriveZ; ++i)
 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_KErrNone(r);
+test(r==KErrNone);
 // if no media present
 if (driveInfo.iType==EMediaNotPresent)
 {
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
-test_Value(r, r == KErrNone || r == KErrNotReady);
+test(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_Value(r, r == KErrNotReady);
+test(r == KErrNotReady);
 }
 else
 {
 r = TheFs.QueryVolumeInfoExt(i, EIOParamInfo, ioInfo);
 test(KErrNone == r);
 drive.Disconnect();
 }
 }
 TPckg<TLocalDriveCapsV7> capsPckg(DriveCapsV7);
 r=drive.Caps(capsPckg);
-test_KErrNone(r);
+test(r==KErrNone);
 if ((fsName.CompareF(_L("Lffs"))==0) && (DriveCapsV7.iObjectModeSize != 0))
 {
 test(ioInfo().iBlockSize == (TInt) DriveCapsV7.iObjectModeSize);
 continue;
 }
 //! @SYMTestPriority        High
 //! @SYMTestStatus          Implemented
 //----------------------------------------------------------------------------------------------
 static void TestFileSystemSubType()
 {
-test.Next(_L("Test wrapper API RFs::FileSystemSubType()'s behaviour\n"));
+test.Next(_L("Test wrapper API RFs::FileSystemSubType()'s behaviour"));
 TFSName fsName;
 TPckgBuf<TFSName> subName;
 TInt r;
 TFSName subName1;
 TInt r1;
 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_Value(r, r == r1);
+test(r==r1);
 if (subName().Length())
 {
 test(subName().CompareF(subName1)==0);
 }
 else
 //! @SYMTestPriority        High
 //! @SYMTestStatus          Implemented
 //----------------------------------------------------------------------------------------------
 static void TestVolumeIOParam()
 {
-test.Next(_L("Test wrapper API RFs::VolumeIOParam()'s behaviour\n"));
+test.Next(_L("Test wrapper API RFs::VolumeIOParam()'s behaviour"));
 TFSName fsName;
 TPckgBuf<TVolumeIOParamInfo> ioInfo;
 TInt r;
 TVolumeIOParamInfo ioInfo1;
 TInt r1;
 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_Value(r, r == r1);
+test(r==r1);
 test(ioInfo().iBlockSize == ioInfo1.iBlockSize);
 test(ioInfo().iClusterSize == ioInfo1.iClusterSize);
 test(ioInfo().iRecReadBufSize == ioInfo1.iRecReadBufSize);
 test(ioInfo().iRecWriteBufSize == ioInfo1.iRecWriteBufSize);
 }
 TInt r;
 test.Printf(_L("Tested on drive: %c.\n"), (char)(aDrive+'A'));
 // Mount a new CTestFileSystem on the drive under test
-test.Next(_L("Test RFs::QueryVolumeInfoExt() on Testing File System\n"));
+test.Next(_L("Test RFs::QueryVolumeInfoExt() on Testing File System"));
-r = TheFs.AddFileSystem(KTestFsy3);
+r = TheFs.AddFileSystem(_L("T_TFSYS3"));
 if (r != KErrNone && r != KErrAlreadyExists)
 {
-test.Printf(_L("error=%d\n"),r);
+test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 TFSName oldFs;
 r = TheFs.FileSystemName(oldFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 r = TheFs.DismountFileSystem(oldFs,aDrive);
 if (r != KErrNone)
 {
-test.Printf(_L("Error = %d\n"),r);
+test.Printf(_L("Error = %d"),r);
 test(EFalse);
 }
-r = TheFs.MountFileSystem(KTestFsName3, aDrive);
+r = TheFs.MountFileSystem(_L("Test3"),aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 TFSName newFs;
 r = TheFs.FileSystemName(newFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-test(newFs.Compare(KTestFsName3)==0);
+test(newFs.Compare(_L("Test3"))==0);
 // Sub type name query:
 TPckgBuf<TFSName> subNameP;
 r = TheFs.QueryVolumeInfoExt(aDrive, EFileSystemSubType, subNameP);
-test_KErrNone(r);
+test(r==KErrNone);
 test(subNameP() == _L("Test3SubType"));
 // Cluster size querys:
 TPckgBuf<TVolumeIOParamInfo> ioInfoP;
 r = TheFs.QueryVolumeInfoExt(aDrive, EIOParamInfo, ioInfoP);
-test_KErrNone(r);
+test(r==KErrNone);
 test(ioInfoP().iClusterSize==1024);
 // Mount the original file system back
 r=TheFs.DismountFileSystem(newFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
 r=TheFs.MountFileSystem(oldFs,aDrive);
-test_KErrNone(r);
+test(r==KErrNone);
-r=TheFs.RemoveFileSystem(KTestFsName3);
+r=TheFs.RemoveFileSystem(_L("Test3"));
 if(r!=KErrNone)
 {
-test.Printf(_L("error=%d\n"),r);
+test.Printf(_L("error=%d"),r);
 test(EFalse);
 }
 }
 */
 static void TestRemountFSWithOpenedObjects()
 {
 test.Next(_L("Testing forcedly remounting FS with objects opened.\n"));
-//-- don't perform this test on a non-removable drive, generating media change on such drive
-//-- doesn't always work
 TInt nRes;
-const TInt drvNumber = CurrentDrive();
-TDriveInfo driveInfo;
-nRes = TheFs.Drive(driveInfo, drvNumber);
-test_KErrNone(nRes);
-if(! (driveInfo.iDriveAtt & KDriveAttRemovable))
-{
-test.Printf(_L("Can't perform this test on a non-removable drive. Skippping!\n"));
-return;
-}
 //-- 1. create a file
 _LIT(KFile, "\\test_file.file");
 const TUint KFileSz = 5000;
 nRes = CreateCheckableStuffedFile(TheFs, KFile, KFileSz);
 //-- 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, drvNumber);
 test_KErrNone(nRes);
 // 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(drvNumber, NULL, KMediaRemountForceMediaChange);
 if(nRes == KErrNotSupported)
 	{//-- this feature is not supported and the test is inconsistent.
-test.Printf(_L("RemountDrive() is not supported, the test is inconsistent!\n"));
+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, drvNumber);
 nRes = TheFs.Drive(driveInfo, drvNumber);
 test_Value(driveInfo.iDriveAtt, !isFAT || (!(driveInfo.iDriveAtt & KDriveAttRemovable)));
 	}
 else
 	{
 		test_Value(nRes, nRes == KErrNotReady || nRes == KErrNone);
-		test.Printf(_L("Waiting for the simulated media change...\n"));
 		//-- 3.1 wait for media change to complete
 		do
 			{
 			// Waiting for media change...
 			User::WaitForRequest(changeStatus);
 }
 //----------------------------------------------------------------------------------------------
 static void TestFileSystem_MaxSupportedFileSizeQuery()
 {
-test.Next(_L("Test querying max. supported file size on this file system\n"));
+test.Next(_L("Test querying max. supported file size on this file system"));
 TFullName fsName;
 TPckgBuf<TVolumeIOParamInfo> ioInfo;
 TVolumeIOParamInfo& volInfo = ioInfo();
 const TInt drvNo=CurrentDrive();
 }
 }
 //----------------------------------------------------------------------------------------------
-void CallTestsL()
+GLDEF_C void CallTestsL()
+//
+// Do all tests
+//
 {
 //-- set up console output
 Fat_Test_Utils::SetConsole(test.Console());
-const TInt drive=CurrentDrive();
+TInt drive=CurrentDrive();
 PrintDrvInfo(TheFs, drive);
-//Do not run this test on the NAND drive, as this has the FTL mounted as a primary extension
+//Do not run this test on the NAND drive, as
+//this has the FTL mounted as a primary extension
 //which causes the test to fail
+#if defined(__WINS__)
-TFSName pExtName;
+if (drive==EDriveU)
-pExtName.Zero();
+return;
+#else
-TInt nRes = TheFs.ExtensionName(pExtName, drive, 0);
+TDriveInfo driveInfo;
+TheFs.Drive(driveInfo,drive);
-if(nRes == KErrNone && pExtName.Length())
+if (driveInfo.iType == EMediaNANDFlash)
 {
-test.Printf(_L("This test can't be run on a drive that has a primary extension:%S\n"), &pExtName);
+return;
-return;
+}
-}
+#endif
 //---------------------------------------
-InitGlobals();
-//---------------------------------------
 TestFileSystemNames();
 TestDismountFileSystem(CurrentDrive());
+#if defined(__EPOC32__)
 TestFileSystem(CurrentDrive());
+#endif
 TestMountInvalidDrive();
 TestMountingBrokenMedia(CurrentDrive());
 TestSubstDriveMediaSerialNumber();
 TestFileSystemSubTypeQuery();
 TestFileSystemClusterSizeQuery();
 TestMediaBlockSizeQuery();
 TestFileSystemSubType();
 TestVolumeIOParam();
 TestQueryVolumeInfoExtOnTestFS(CurrentDrive());
 TestFileSystem_MaxSupportedFileSizeQuery();
 TestRemountFSWithOpenedObjects();
-//---------------------------------------
-DestroyGlobals();
+}
-}

branch	RCL_3
changeset 294	039a3e647356
parent 268	345b1ca54e88