--- a/kerneltest/f32test/filesystem/fat/t_scn32dr2.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/filesystem/fat/t_scn32dr2.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -11,10 +11,9 @@
 // Contributors:
 //
 // Description:
-// f32test\filesystem\fat\t_scn32dr2.cpp
+// f32test\scndrv\t_scn32dr2.cpp
 //
-
-#define __E32TEST_EXTENSION__
+//
 
 #include <f32file.h>
 #include <e32test.h>
@@ -72,7 +71,7 @@
     TInt gDriveNumber;
 
     TInt r = TheFs.CharToDrive( gSessionPath[0], gDriveNumber );
-    test_KErrNone(r);
+    test( KErrNone == r );
 
     //-- set up console output
     Fat_Test_Utils::SetConsole(test.Console());
@@ -96,18 +95,18 @@
     TUint8 oldFsys;
     TPtr8 pRugged(&oldFsys,1,1);
     r=TheFs.ControlIo(gDriveNumber,KControlIoIsRugged,pRugged);
-    test_KErrNone(r);
+    test(r==KErrNone);
     if(oldFsys==0)
         {
         r=TheFs.ControlIo(gDriveNumber,KControlIoRuggedOn);
-        test_KErrNone(r);
+        test(r==KErrNone);
         }
     DoTests();
     // if nec, set filing system back to !rugged
     if(oldFsys==0)
         {
         r=TheFs.ControlIo(gDriveNumber,KControlIoRuggedOff);
-        test_KErrNone(r);
+        test(r==KErrNone);
         }
 
     return;