diff -r 5e441a173c63 -r d9f1e5bfe28c kerneltest/f32test/manager/t_romg.cpp --- a/kerneltest/f32test/manager/t_romg.cpp Mon May 24 18:45:46 2010 +0100 +++ b/kerneltest/f32test/manager/t_romg.cpp Thu Jun 10 11:48:01 2010 +0100 @@ -15,6 +15,7 @@ // // +#define __E32TEST_EXTENSION__ #include #include #include @@ -452,12 +453,12 @@ // test.Next(_L("Create root mem dir")); TRAPD(r,TheRootDir=CMemDir::NewL()); - test(r==KErrNone); + test_KErrNone(r); // test.Next(_L("Load directory structure")); TheLevel=(-1); TRAP(r,TheRootDir->LoadDirL(n)); - test(r==KErrNone); + test_KErrNone(r); test(TheLevel==(-1)); // delete buf; @@ -553,11 +554,11 @@ test.End(); return; } - test(r==KErrNone || r==KErrNotFound); + test_Value(r, r == KErrNone || r==KErrNotFound); // test.Next(_L("Generating ROM image")); TRAP(r,buildRomImageL()); - test(r==KErrNone); + test_KErrNone(r); // test.Next(_L("Basing the rom image")); baseRomImage(); @@ -566,7 +567,7 @@ b+=TheFileName; test.Next(b); r=TheFile.Replace(TheFs,TheFileName,EFileStream|EFileWrite); - test(r==KErrNone); + test_KErrNone(r); writeRomImage(); TheFile.Close(); delete TheRootDir;