--- a/kerneltest/f32test/server/b_rep.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/b_rep.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -15,7 +15,6 @@
 // 
 //
 
-#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include "t_server.h"
@@ -43,43 +42,43 @@
 
         // Replace file and write data
 		r=TheFile.Replace(TheFs,nameBuf1,EFileStream);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFile.Write(testPat1);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		
 		Mem::Copy(&buf[0],&numb,sizeof(TInt));
 		r=TheFile.Write(buf);
-		test_KErrNone(r);
+		test(r==KErrNone);
 
         // Seek to 0 and check data
 		TInt pos=0; 
 		r=TheFile.Seek(ESeekStart,pos);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		test(pos==0);
 		r=TheFile.Read(chkPat1,len);
-        test_KErrNone(r);
+        test(r==KErrNone);
         test(chkPat1==testPat1);
 		r=TheFile.Read(testBuf,sizeof(TInt));
-        test_KErrNone(r);
+        test(r==KErrNone);
 		TInt chkNumb=*((TInt*)testBuf.Ptr());
         test(chkNumb==numb);
 
         // Close, then re-open file and check data
 		TheFile.Close();
 		r=TheFile.Open(TheFs,nameBuf1,EFileStream);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFile.Read(chkPat1,len);
-        test_KErrNone(r);
+        test(r==KErrNone);
         test(chkPat1==testPat1);
 		r=TheFile.Read(testBuf,sizeof(TInt));
-        test_KErrNone(r);
+        test(r==KErrNone);
 		chkNumb=*((TInt*)testBuf.Ptr());
         test(chkNumb==numb);
 		TheFile.Close();
 		}
 	test.Printf(_L("\n"));
 	r=TheFs.Delete(nameBuf1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 GLDEF_C void CallTestsL(void)
@@ -102,9 +101,9 @@
 	test.Next(_L("Subdirectory"));
 	gSessionPath=_L("\\F32-TST\\TEST1\\");
 	TInt r=TheFs.SetSessionPath(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.MkDirAll(gSessionPath);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 
 	DoTest();