--- a/kerneltest/f32test/filesystem/fat/t_raw.cpp Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/filesystem/fat/t_raw.cpp Wed Sep 01 12:34:56 2010 +0100
@@ -39,12 +39,12 @@
test.Start(_L("Test all methods"));
RRawDisk rd;
TInt r=rd.Open(TheFs,gDrive);
- test_KErrNone(r);
+ test(r==KErrNone);
TBuf8<16> buf;
r=rd.Read(0,buf);
- test_KErrNone(r);
+ test(r==KErrNone);
r=rd.Write(0,buf);
- test_KErrNone(r);
+ test(r==KErrNone);
rd.Close();
test.End();
}
@@ -60,49 +60,49 @@
RFile f;
TInt r=f.Open(TheFs,_L("TRAW.TST"),EFileWrite);
- test_KErrNone(r);
+ test(r==KErrNone);
RRawDisk rd;
r=rd.Open(TheFs,gDrive);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
f.Close();
r=rd.Open(TheFs,gDrive);
- test_KErrNone(r);
+ test(r==KErrNone);
rd.Close();
TFileName fileName;
r=f.Temp(TheFs,_L(""),fileName,EFileWrite);
- test_KErrNone(r);
+ test(r==KErrNone);
r=rd.Open(TheFs,gDrive);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
f.Close();
r=rd.Open(TheFs,gDrive);
- test_KErrNone(r);
+ test(r==KErrNone);
rd.Close();
RDir d;
r=d.Open(TheFs,_L("TRAWTEST"),KEntryAttNormal);
- test_KErrNone(r);
+ test(r==KErrNone);
r=rd.Open(TheFs,gDrive);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
d.Close();
r=rd.Open(TheFs,gDrive);
- test_KErrNone(r);
+ test(r==KErrNone);
rd.Close();
RFormat fmt;
TInt count;
r=fmt.Open(TheFs,gSessionPath,EQuickFormat,count);
- test_KErrNone(r);
+ test(r==KErrNone);
r=rd.Open(TheFs,gDrive); // Raw disk access ok during formatting
test.Printf(_L("open rd when fmt opn r=%d"),r);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
fmt.Close();
r=rd.Open(TheFs,gDrive);
test.Printf(_L("open rd when fmt closed r=%d"),r);
- test_KErrNone(r);
+ test(r==KErrNone);
RRawDisk rd2;
r=rd2.Open(TheFs,gDrive); //should only have one Raw object open
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
rd2.Close();
rd.Close();
}
@@ -118,34 +118,34 @@
RRawDisk rd;
TInt r=rd.Open(TheFs,gDrive);
- test_KErrNone(r);
+ test(r==KErrNone);
RFile f;
TFileName fileName;
r=f.Open(TheFs,_L("TRAW.TST"),EFileWrite);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
r=f.Temp(TheFs,_L(""),fileName,EFileWrite);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
RDir d;
r=d.Open(TheFs,_L("TRAW"),KEntryAttNormal);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
RFormat fmt;
TInt count;
r=fmt.Open(TheFs,gSessionPath,EQuickFormat,count);
if (r != KErrInUse)
test.Printf(_L("Error %d. Sess = %S"), r, &gSessionPath);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
CDir* dir=(CDir*)0x05;
r=TheFs.GetDir(_L("\\F32-TST\\*.*"),KEntryAttNormal,ESortNone,dir);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
test(dir==NULL);
RRawDisk rd2;
r=rd2.Open(TheFs,gDrive);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
// fmt.Close();
rd.Close();
@@ -163,7 +163,7 @@
RRawDisk rd;
TInt r=rd.Open(TheFs,gDrive);
- test_KErrNone(r);
+ test(r==KErrNone);
TBuf8<32> textBuf;
TInt64 pos=0;
@@ -190,14 +190,14 @@
TBuf8<32> contents2=_L8("This File says MOO");
r=rd.Write(pos,contents2);
- test_KErrNone(r);
+ test(r==KErrNone);
rd.Close();
RFile f;
r=f.Open(TheFs,_L("TRAW.TST"),EFileRead);
- test_KErrNone(r);
+ test(r==KErrNone);
r=f.Read(textBuf);
- test_KErrNone(r);
+ test(r==KErrNone);
test(textBuf==contents2);
f.Close();
}
@@ -260,7 +260,7 @@
RThread thread;
TInt r=thread.Create(_L("MyThread"),MyThreadFunction,0x1000,0x1000,0x1000,(TAny*)EThreadForgetToCloseSession);
- test_KErrNone(r);
+ test(r==KErrNone);
TRequestStatus reqStat;
thread.Logon(reqStat);
thread.Resume();
@@ -274,11 +274,11 @@
RFile f;
r=f.Open(TheFs,_L("TEST.FILE"),EFileWrite);
- test_KErrNone(r);
+ test(r==KErrNone);
f.Close();
r=thread.Create(_L("MyThread"),MyThreadFunction,0x1000,0x1000,0x1000,(TAny*)EThreadForgetToCloseRaw);
- test_KErrNone(r);
+ test(r==KErrNone);
thread.Logon(reqStat);
thread.Resume();
User::WaitForRequest(reqStat);
@@ -290,19 +290,19 @@
FsBarrier();
r=f.Open(TheFs,_L("TEST.FILE"),EFileWrite);
- test_KErrNone(r);
+ test(r==KErrNone);
f.Close();
r=gSemaphore.CreateGlobal(_L("MySemaphore"),0);
- test_KErrNone(r);
+ test(r==KErrNone);
r=thread.Create(_L("MyThread"),MyThreadFunction,0x1000,0x1000,0x1000,(TAny*)EThreadHang);
- test_KErrNone(r);
+ test(r==KErrNone);
thread.Resume();
gSemaphore.Wait();
gSemaphore.Close();
r=f.Open(TheFs,_L("TEST.FILE"),EFileWrite);
- test_Value(r, r == KErrInUse);
+ test(r==KErrInUse);
TBool jit = User::JustInTime();
User::SetJustInTime(EFalse);
thread.Kill(KErrGeneral);
@@ -315,7 +315,7 @@
FsBarrier();
r=f.Open(TheFs,_L("TEST.FILE"),EFileWrite);
- test_KErrNone(r);
+ test(r==KErrNone);
f.Close();
}
@@ -330,7 +330,7 @@
Fat_Test_Utils::SetConsole(test.Console());
TInt r=TheFs.CharToDrive(gSessionPath[0],gDrive);
- test_KErrNone(r);
+ test(r==KErrNone);
PrintDrvInfo(TheFs, gDrive);