diff -r ef2a444a7410 -r b3a1d9898418 kerneltest/f32test/server/clean_prepdc.cpp --- a/kerneltest/f32test/server/clean_prepdc.cpp Mon May 03 13:47:38 2010 +0300 +++ b/kerneltest/f32test/server/clean_prepdc.cpp Fri May 14 17:13:29 2010 +0300 @@ -18,6 +18,7 @@ // +#define __E32TEST_EXTENSION__ #include #include #include @@ -56,11 +57,11 @@ { CFileMan* fMan=CFileMan::NewL(TheFs); TInt r=fMan->RmDir(_L("\\Resource\\")); - test(r==KErrNone || r==KErrPathNotFound); + test_Value(r, r == KErrNone || r==KErrPathNotFound); r=fMan->RmDir(_L("\\Sys\\")); - test(r==KErrNone || r==KErrPathNotFound); + test_Value(r, r == KErrNone || r==KErrPathNotFound); r=fMan->RmDir(_L("\\Private\\")); - test(r==KErrNone || r==KErrPathNotFound); + test_Value(r, r == KErrNone || r==KErrPathNotFound); delete fMan; } @@ -70,12 +71,12 @@ // { TInt r=TheFs.MkDir(_L("\\Resource\\")); - test(r==KErrNone); + test_KErrNone(r); r=TheFs.MkDir(_L("\\Sys\\")); - test(r==KErrNone); + test_KErrNone(r); RFile f; r=f.Create(TheFs,_L("\\Resource\\resourcefile.txt"),EFileWrite); - test(r==KErrNone || r==KErrAlreadyExists); + test_Value(r, r == KErrNone || r==KErrAlreadyExists); f.Close(); } @@ -86,7 +87,7 @@ { TBuf<30> tmp; TInt r= TheFs.SessionPath(tmp); - test(r==KErrNone); + test_KErrNone(r); RDebug::Print(_L("sessp=%S"),&tmp); CleanupL(); TestSetup();