--- a/kerneltest/f32test/filesystem/fat/t_compat32.cpp Mon May 24 18:45:46 2010 +0100
+++ b/kerneltest/f32test/filesystem/fat/t_compat32.cpp Thu Jun 10 11:48:01 2010 +0100
@@ -98,13 +98,13 @@
RFile file;
TInt r=file.Create(TheFs,fileName,EFileRead);
- test(r==KErrNone);
+ test_KErrNone(r);
file.Close();
// Assume this file is the first entry in the root directory
r=TheDisk.Open(TheFs,CurrentDrive());
- test(r==KErrNone);
+ test_KErrNone(r);
//-- read 1st dir. entry it can be FAT or VFat , depending on the filename
const TInt posEntry1=gBootSector.RootDirStartSector() << KDefaultSectorLog2; //-- dir entry1 position
@@ -169,16 +169,16 @@
TInt r;
r=file.Replace(TheFs,_L("\\FILE.TMP"),EFileRead);
- test(r==KErrNone);
+ test_KErrNone(r);
r=file.Write(_L8("Hello World"));
file.Close();
r=TheFs.Replace(_L("\\File.tmp"),_L("\\Word"));
- test(r==KErrNone);
+ test_KErrNone(r);
CDir* entryCount;
r=TheFs.GetDir(_L("\\*.*"),KEntryAttMaskSupported,ESortNone,entryCount);
- test(r==KErrNone);
+ test_KErrNone(r);
TInt count=entryCount->Count();
test(count==1);
@@ -202,17 +202,17 @@
DoFiddleWithFileNames(aCase);
r=file.Create(TheFs,_L("\\TEST"),EFileRead);
- test(r==KErrNone);
+ test_KErrNone(r);
file.Close();
r=TheFs.Rename(_L("\\TEST"),_L("\\Word"));
- test(r==KErrAlreadyExists);
+ test_Value(r, r == KErrAlreadyExists);
r=TheFs.Delete(_L("\\TEST"));
- test(r==KErrNone);
+ test_KErrNone(r);
CDir* entryCount;
r=TheFs.GetDir(_L("\\*.*"),KEntryAttMaskSupported,ESortNone,entryCount);
- test(r==KErrNone);
+ test_KErrNone(r);
TInt count=entryCount->Count();
test(count==1);
delete entryCount;
@@ -241,14 +241,14 @@
fn.Format(_L("%c:\\\x60\x60\x60.TXT"), (TUint8)gDriveToTest);
r = TheFs.Delete(fn);
- test(r==KErrNone || r==KErrNotFound);
+ test_Value(r, r == KErrNone || r==KErrNotFound);
r = file.Create(TheFs, fn, EFileRead);
- test(r==KErrNone);
+ test_KErrNone(r);
file.Close();
r=TheDisk.Open(TheFs,CurrentDrive());
- test(r==KErrNone);
+ test_KErrNone(r);
//-- read 1st dir. it should be DOS Entry
const TInt posEntry1=gBootSector.RootDirStartSector() << KDefaultSectorLog2; //-- dir entry1 position
@@ -261,11 +261,11 @@
// tests short name
TFileName sn;
r = TheFs.GetShortName(fn, sn);
- test(r==KErrNone);
+ test_KErrNone(r);
test(sn.Compare(_L("```.TXT"))==0);
r = TheFs.Delete(fn);
- test(r==KErrNone);
+ test_KErrNone(r);
}
#if defined(_DEBUG) || defined(_DEBUG_RELEASE)
@@ -295,23 +295,23 @@
TInt drvNum;
r = TheFs.CharToDrive(gDriveToTest,drvNum);
- test(r==KErrNone);
+ test_KErrNone(r);
// turn on FatUtilityFunctions
r = TheFs.ControlIo(drvNum, KControlIoEnableFatUtilityFunctions);
- test(r==KErrNone);
+ test_KErrNone(r);
// load cp932 codepage dll
r = UserSvr::ChangeLocale(KTestLocale);
- test(r==KErrNone);
+ test_KErrNone(r);
// create file "\x65B0\x6587\x4EF6", check DOS entry & VFat entry
r = file.Create(TheFs, KTestUnicodeFileName, EFileRead);
- test(r==KErrNone);
+ test_KErrNone(r);
file.Close();
r=TheDisk.Open(TheFs,CurrentDrive());
- test(r==KErrNone);
+ test_KErrNone(r);
//-- read 1st dir. it should be VFat
// const TInt posEntry1=gRootDirStart; //-- dir entry1 position
@@ -339,11 +339,11 @@
// delete file
TheDisk.Close();
r = TheFs.Delete(KTestUnicodeFileName);
- test(r==KErrNone);
+ test_KErrNone(r);
// turn off FatUtilityFunctions
r = TheFs.ControlIo(drvNum, KControlIoDisableFatUtilityFunctions);
- test(r==KErrNone);
+ test_KErrNone(r);
#else
test.Printf(_L("Test only runs on DEBUG builds, see test logs of debug builds for details."));
@@ -607,7 +607,7 @@
TInt drvNum;
TInt r=TheFs.CharToDrive(gDriveToTest,drvNum);
- test(r==KErrNone);
+ test_KErrNone(r);
if (!Is_Fat(TheFs,drvNum))
{