diff -r ef2a444a7410 -r b3a1d9898418 kerneltest/f32test/server/t_ftrace.cpp --- a/kerneltest/f32test/server/t_ftrace.cpp Mon May 03 13:47:38 2010 +0300 +++ b/kerneltest/f32test/server/t_ftrace.cpp Fri May 14 17:13:29 2010 +0300 @@ -15,6 +15,7 @@ // // +#define __E32TEST_EXTENSION__ #include #include #include @@ -76,7 +77,7 @@ Trace.Empty(); TInt r = file.Replace(TheFs,testFileName,EFileStreamText); - test(r==KErrNone); + test_KErrNone(r); TBool funcInFound = EFalse; @@ -226,13 +227,13 @@ TheFs.Delete(testFileName2); TInt r = file.Replace(TheFs,testFileName1,EFileStreamText); - test(r==KErrNone || KErrAlreadyExists); + test_Value(r, r == KErrNone || r == KErrAlreadyExists); file.Close(); Trace.Empty(); r = TheFs.Rename(testFileName1, testFileName2); - test(r==KErrNone); + test_KErrNone(r); TBool funcInFound = EFalse; @@ -379,7 +380,7 @@ test.Start(_L("Open LDD")); r = Trace.Open(); - test(r == KErrNone); + test_KErrNone(r); TUint32 OldTraceFilter[8] = {0};