--- a/kerneltest/f32test/server/t_dctcbdiskadmin.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/t_dctcbdiskadmin.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -13,7 +13,6 @@
 // Description:
 //
 
-#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include <e32std.h>
@@ -76,6 +75,9 @@
 TRequestStatus aStat3;
 TRequestStatus aStat4;
 
+TVolumeInfo aVolInfo;
+//	TDriveInfo adriveInfo;
+
 TBuf<40> systestfile;
 TBuf<40> pritestfile;
 TBuf<40> restestfile;
@@ -107,19 +109,19 @@
 	mkdirname.Append(KMkDirSub);
 
 	r=TheFs.MkDirAll(mkdirname);	
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.RmDir(mkdirname);	
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.SetSubst(pritestfalseidname,EDriveO);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.RealName(_L("O:\\File.XXX"),realName);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSessionPath(pritestfalseidname);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	TheFs.NotifyChange(ENotifyAll,aStat2,pritestfalseidname);
 	test(aStat2==KErrPermissionDenied);
@@ -135,32 +137,32 @@
 	oldName[0]=(TText)gDriveToTest;
 
 	r=TheFs.GetShortName(pritestfile, shortfilename);
-	test_Value(r, r == KErrPermissionDenied || r==KErrNotSupported);
+	test(r==KErrPermissionDenied || r==KErrNotSupported);
 
 	r=TheFs.GetLongName(pritestfile1, longfilename);
-	test_Value(r, r == KErrPermissionDenied || r==KErrNotSupported);
+	test(r==KErrPermissionDenied || r==KErrNotSupported);
 
 	r=file1.Create(TheFs,oldName,EFileWrite);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	file1.Close();
 
 	r=TheFs.Replace(oldName,pritestfile);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	
 	r=TheFs.Rename(pritestfile,pritestfile1);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	
 	r=TheFs.Entry(pritestfile1,entry);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.SetEntry(pritestfile1,testtime,KEntryAttNormal,KEntryAttReadOnly);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.Delete(pritestfile1);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.Delete(oldName);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	__UHEAP_MARKEND;
 	}
@@ -178,22 +180,22 @@
 	mkdirname.Append(systestname);
 	mkdirname.Append(KMkDirSub);
 	r=TheFs.MkDirAll(mkdirname);	
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	TheFs.RmDir(mkdirname);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSubst(systestname,EDriveO);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=TheFs.RealName(_L("O:\\File.XXX"),realName);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.SetSubst(_L(""),EDriveO); //to unsubst
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSessionPath(systestname);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	
 	TheFs.NotifyChange(ENotifyAll,aStat1,systestname);
 	test(aStat1==KErrPermissionDenied);
@@ -208,32 +210,32 @@
 	oldName[0]=(TText)gDriveToTest;
 
 	r=TheFs.GetShortName(systestfile, shortfilename);
-	test_Value(r, r == KErrPermissionDenied || r==KErrNotSupported);
+	test(r==KErrPermissionDenied || r==KErrNotSupported);
 
 	r=TheFs.GetLongName(systestfile1, longfilename);
-	test_Value(r, r == KErrPermissionDenied || r==KErrNotSupported);
+	test(r==KErrPermissionDenied || r==KErrNotSupported);
 
 	r=file1.Create(TheFs,oldName,EFileWrite);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	file1.Close();
 
 	r=TheFs.Replace(oldName,systestfile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=TheFs.Delete(systestfile1);
-	test_Value(r, r == KErrNone || r==KErrNotFound);
+	test(r==KErrNone || r==KErrNotFound);
 
 	r=TheFs.Rename(systestfile,systestfile1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=TheFs.Entry(systestfile1,entry);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.SetEntry(systestfile1,testtime,KEntryAttNormal,KEntryAttReadOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.Delete(systestfile1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	__UHEAP_MARKEND;
 	}
@@ -252,22 +254,22 @@
 	mkdirname.Append(restestname);
 	mkdirname.Append(KMkDirSub);
 	r=TheFs.MkDirAll(mkdirname);	
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	TheFs.RmDir(mkdirname);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSubst(restestname,EDriveO);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=TheFs.RealName(_L("O:\\File.XXX"),realName);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSubst(_L(""),EDriveO); //to unsubst
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSessionPath(restestname);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	TheFs.NotifyChange(ENotifyAll,aStat4,restestname);
 	test(aStat4==KRequestPending);
@@ -282,32 +284,32 @@
 	oldName[0]=(TText)gDriveToTest;
 
 	r=TheFs.GetShortName(restestfile, shortfilename);
-	test_Value(r, r == KErrNone || r == KErrNotFound || r==KErrNotSupported);
+	test(r==KErrNone || KErrNotFound || r==KErrNotSupported);
 
 	r=TheFs.GetLongName(restestfile1, longfilename);
-	test_Value(r, r == KErrNone || r == KErrNotFound || r==KErrNotSupported);
+	test(r==KErrNone || KErrNotFound || r==KErrNotSupported);
 
 	r=file1.Create(TheFs,oldName,EFileWrite);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	file1.Close();
 
 	r=TheFs.Replace(oldName,restestfile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=TheFs.Delete(restestfile1);
-	test_Value(r, r == KErrNone || r==KErrNotFound);
+	test(r==KErrNone || r==KErrNotFound);
 
 	r=TheFs.Rename(restestfile,restestfile1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=TheFs.Entry(restestfile1,entry);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetEntry(restestfile1,testtime,KEntryAttNormal,KEntryAttReadOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.Delete(restestfile1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 
 	__UHEAP_MARKEND;
@@ -329,19 +331,19 @@
 	mkdirname.Append(KMkDirSub);
 
 	r=TheFs.MkDirAll(mkdirname);	
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.RmDir(mkdirname);	
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.SetSubst(pritestname,EDriveO);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.RealName(_L("O:\\File.XXX"),realName);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSessionPath(pritestname);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	TheFs.NotifyChange(ENotifyAll,aStat2,pritestname);
 	test(aStat2==KErrPermissionDenied);
@@ -357,29 +359,29 @@
 	oldName[0]=(TText)gDriveToTest;
 
 	r=TheFs.GetShortName(pritestfile, shortfilename);
-	test_Value(r, r == KErrPermissionDenied || r==KErrNotSupported);
+	test(r==KErrPermissionDenied || r==KErrNotSupported);
 
 	r=TheFs.GetLongName(pritestfile1, longfilename);
-	test_Value(r, r == KErrPermissionDenied || r==KErrNotSupported);
+	test(r==KErrPermissionDenied || r==KErrNotSupported);
 
 	r=file1.Create(TheFs,oldName,EFileWrite);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	file1.Close();
 
 	r=TheFs.Replace(oldName,pritestfile);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	
 	r=TheFs.Rename(pritestfile,pritestfile1);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	
 	r=TheFs.Entry(pritestfile1,entry);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.SetEntry(pritestfile1,testtime,KEntryAttNormal,KEntryAttReadOnly);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=TheFs.Delete(pritestfile1);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 
 	__UHEAP_MARKEND;
@@ -397,22 +399,22 @@
 	mkdirname.Append(theprivatepath);
 	mkdirname.Append(KMkDirSub);
 	r=TheFs.MkDirAll(mkdirname);	
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.RmDir(mkdirname);	
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSubst(theprivatepath,EDriveO);	
-	test_KErrNone(r); 
+	test(r==KErrNone); 
 
 	r=TheFs.RealName(_L("O:\\File.XXX"),realName);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSubst(_L(""),EDriveO);	 //to unsubst
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetSessionPath(theprivatepath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	TheFs.NotifyChange(ENotifyAll,aStat3,theprivatepath);
 	test(aStat3==KRequestPending);
@@ -427,29 +429,29 @@
 	oldName[0]=(TText)gDriveToTest;
 
 	r=TheFs.GetShortName(pritestfile, shortfilename);
-	test_Value(r, r == KErrNone || r==KErrNotFound || r==KErrNotSupported);
+	test(r==KErrNone || r==KErrNotFound || r==KErrNotSupported);
 
 	r=TheFs.GetLongName(pritestfile1, longfilename);
-	test_Value(r, r == KErrNone || r==KErrNotFound || r==KErrNotSupported);
+	test(r==KErrNone || r==KErrNotFound || r==KErrNotSupported);
 
 	r=file1.Create(TheFs,oldName,EFileWrite);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	file1.Close();
 
 	r=TheFs.Replace(oldName,pritestfile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=TheFs.Rename(pritestfile,pritestfile1);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	
 	r=TheFs.Entry(pritestfile1,entry);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.SetEntry(pritestfile1,testtime,KEntryAttNormal,KEntryAttReadOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.Delete(pritestfile1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	__UHEAP_MARKEND;
 	}
@@ -463,10 +465,10 @@
 	__UHEAP_MARK;
 
 	r=TheFs.SetSessionPath(systestname);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=file1.Temp(TheFs,systestname,fromTemp,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	systestfile=KSystemPath;
@@ -476,22 +478,22 @@
 	systestfile1.Append(KFileSys3);
 
 	r=file1.Create(TheFs,systestfile,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Open(TheFs,systestfile,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 	
 	r=file1.Open(TheFs,systestfile,EFileRead);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 
 	r=file1.Replace(TheFs,systestfile,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=file1.Rename(systestfile1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
     TFindFile finder(TheFs);
@@ -499,14 +501,14 @@
     r=finder.FindWildByDir(KWildFile, KWildPath, dir);
 	if (!(r==KErrPermissionDenied))
         test.Printf(_L("T_DCTCBDISKADMIN: test find wildcards r = %d (expected KErrPermissionDenied)\n"), r);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 //	delete dir;
 
 	r=TheFs.Delete(fromTemp);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.Delete(systestfile1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 
 	__UHEAP_MARKEND;
@@ -520,50 +522,50 @@
 	__UHEAP_MARK;
 
 	r=TheFs.SetSessionPath(restestname);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=file1.Temp(TheFs,restestname,fromTemp,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Create(TheFs,KFileRes,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Open(TheFs,KFileRes,EFileWrite|EFileShareExclusive );
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=file1.Rename(KFileRes3);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Open(TheFs,KFileRes3,EFileShareReadersOrWriters|EFileRead);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Open(TheFs,KFileRes3,EFileShareReadersOrWriters|EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Open(TheFs,KFileRes3,EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=file1.ChangeMode(EFileShareExclusive);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Replace(TheFs,KFileRes,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();	
 
 	r=TheFs.Delete(KFileRes);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.Delete(KFileRes3);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.Delete(fromTemp);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	__UHEAP_MARKEND;
 	}
@@ -577,7 +579,7 @@
 	__UHEAP_MARK;
 
 	r=TheFs.SetSessionPath(pritestfalseidname);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	// Since can't set the session path to what is required, so use
 	// an explicit path
@@ -586,23 +588,23 @@
 	pritestfile.Append(KFilePri);
 
 	r=file1.Temp(TheFs,pritestfalseidname,fromTemp,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 
 	r=file1.Create(TheFs,pritestfile,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 
 	r=file1.Open(TheFs,pritestfile,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 	
 	r=file1.Replace(TheFs,pritestfile,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	// Can't perform this operation since file1 has not been created
 /*	r=file1.Rename(KFilePri3);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 */
 	__UHEAP_MARKEND;
@@ -618,10 +620,10 @@
 	__UHEAP_MARK;
 
 	r=TheFs.SetSessionPath(pritestname);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	r=file1.Temp(TheFs,pritestname,fromTemp,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 
 	// Since can't set session path create explicit path
@@ -630,28 +632,28 @@
 	pritestfile.Append(KFilePri);
 
 	r=file1.Create(TheFs,pritestfile,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 
 	r=file1.Open(TheFs,pritestfile,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 	
 	r=file1.Open(TheFs,pritestfile,EFileRead);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 	
 	r=file1.Replace(TheFs,pritestfile,EFileWrite);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 
 	// Can't rename nor delete since file1 not created
 /*
 	r=file1.Rename(KFilePri3);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	file1.Close();
 
 	r=TheFs.Delete(fromTemp);
-	test_KErrNone(r);
+	test(r==KErrNone);
 */
 
 	__UHEAP_MARKEND;
@@ -667,36 +669,36 @@
 	__UHEAP_MARK;
 
 	r=TheFs.SetSessionToPrivate(gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=file1.Temp(TheFs,theprivatepath,fromTemp,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=file1.Create(TheFs,KFilePri,EFileWrite);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	file1.Close();
 
 	r=file1.Open(TheFs,KFilePri,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 	
 	r=file1.Open(TheFs,KFilePri,EFileRead);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 	
 	r=file1.Replace(TheFs,KFilePri,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=file1.Rename(KFilePri3);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 
 	r=TheFs.Delete(KFilePri3);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.Delete(fromTemp);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	__UHEAP_MARKEND;
 	}
@@ -714,10 +716,10 @@
 	TBuf<30> dirNameBuf(KSystemPath);
 	dirNameBuf[0]=(TText)gDriveToTest;
 	r=dir.Open(TheFs,dirNameBuf,KEntryAttNormal);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	dir.Close();
 	r=TheFs.GetDir(dirNameBuf,KEntryAttMatchMask,ESortByName,dirEntries);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	dirNameBuf.Zero();
 	delete dirEntries;
 
@@ -725,10 +727,10 @@
 	dirNameBuf=KPrivatePath;
 	dirNameBuf[0]=(TText)gDriveToTest;
 	r=dir.Open(TheFs,dirNameBuf,KEntryAttNormal);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	dir.Close();
 	r=TheFs.GetDir(dirNameBuf,KEntryAttMatchMask,ESortByName,dirEntries);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	dirNameBuf.Zero();
 	delete dirEntries;
 
@@ -736,10 +738,10 @@
 	dirNameBuf=KPrivateFalseID;
 	dirNameBuf[0]=(TText)gDriveToTest;
 	r=dir.Open(TheFs,dirNameBuf,KEntryAttNormal);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	dir.Close();
 	r=TheFs.GetDir(dirNameBuf,KEntryAttMatchMask,ESortByName,dirEntries);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	dirNameBuf.Zero();
 	delete dirEntries;
 
@@ -748,10 +750,10 @@
 	dirNameBuf.Insert(0,_L("?:"));
 	dirNameBuf[0]=(TText)gDriveToTest;
 	r=dir.Open(TheFs,dirNameBuf,KEntryAttNormal);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	dir.Close();
 	r=TheFs.GetDir(dirNameBuf,KEntryAttMatchMask,ESortByName,dirEntries);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	dirNameBuf.Zero();
 	delete dirEntries;
 	//Resource
@@ -759,9 +761,9 @@
 	dirNameBuf=KResourcePath;
 	dirNameBuf[0]=(TText)gDriveToTest;
 	r=dir.Open(TheFs,dirNameBuf,KEntryAttNormal);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.GetDir(dirNameBuf,KEntryAttMatchMask,ESortByName,dirEntries);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	dir.Close();
 	delete dirEntries;
 
@@ -777,20 +779,20 @@
 	__UHEAP_MARK;
 
 	r=TheFs.FileSystemName(fsname,gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = DismountFileSystem(TheFs, fsname, gTheDriveNum);
-	test_Value(r, r == KErrNone || r==KErrNotFound);
+	test(r==KErrNone || r==KErrNotFound);
 //	r=TheFs.RemoveFileSystem(fsname);	//can not test due to bug else where fix exists
-//	test_KErrNone(r);
+//	test(r==KErrNone);
 //	r=TheFs.AddFileSystem(fsname);
-//	test_KErrNone(r);
+//	test(r==KErrNone);
 	r = MountFileSystem(TheFs, fsname, gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.SetDriveName(gTheDriveNum,KDriveName);
-	test_KErrNone(r);
+	test(r==KErrNone);
 #ifndef __WINS__
  	r=TheFs.SetVolumeLabel(KVolLable, gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 #endif
 
 	systemRFsTest();
@@ -816,11 +818,11 @@
 	test(aStat4==KErrNone);
 
 	r=TheFs.SetSessionPath(systestname);
-	test_Value(r, r == KErrPermissionDenied);
+	test(r==KErrPermissionDenied);
 	
 //Test RRawDisk class
 	r=rawdisk.Open(TheFs,gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	rawdisk.Close();
 
 	RDirtest();
@@ -831,21 +833,21 @@
 		{
 		//Test RFormat class
 		r=format.Open(TheFs,driveBuf,EHighDensity,count);
-		test_KErrNone(r);
+		test(r==KErrNone);
 
 		while(count)	
 			{
 			TInt r=format.Next(count);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			}
 		format.Close();
 		}
 
 	driveBuf[0]=(TText)gDriveToTest;
 	r=TheFs.ScanDrive(driveBuf);
-	test_Value(r, r == KErrNone || r==KErrNotSupported);
+	test(r==KErrNone || r==KErrNotSupported);
 	r=TheFs.CheckDisk(driveBuf);
-	test_Value(r, r == KErrNone || r==KErrNotSupported);
+	test(r==KErrNone || r==KErrNotSupported);
 
 	__UHEAP_MARKEND;
 	}
@@ -865,16 +867,16 @@
 
 	driveBuf[0]=(TText)gDriveToTest;
 	r=TheFs.SessionPath(temp);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	test.Printf(_L("Session path: %S"),&temp);
 
 	r=TheFs.CreatePrivatePath(gTheDriveNum);
-	test_Value(r, r == KErrNone || r== KErrAlreadyExists);
+	test(r==KErrNone || r== KErrAlreadyExists);
 
 	TBuf<18> tempPri;
 	r=TheFs.PrivatePath(tempPri);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	theprivatepath = _L("?:");
 	theprivatepath.Append(tempPri);
 
@@ -883,9 +885,9 @@
 	TFileName thesessionpath;
 
 	r=TheFs.SetSessionToPrivate(gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.SessionPath(thesessionpath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	test(thesessionpath == theprivatepath);
 
@@ -900,19 +902,19 @@
 	test.Next(_L("Delete test directory"));
 	CFileMan* fMan=CFileMan::NewL(TheFs);
 	TInt r=fMan->RmDir(gSessionPath);
-	test_Value(r, r == KErrNone || r==KErrPathNotFound);
+	test(r==KErrNone || r==KErrPathNotFound);
 
 	TBuf<20> delDir;
 	delDir=KResourcePath;
 	delDir[0]=(TText)gDriveToTest;
 	r=fMan->RmDir(delDir);
-	test_Value(r, r == KErrNone || r==KErrPathNotFound);
+	test(r==KErrNone || r==KErrPathNotFound);
 	delete fMan;
 
 	delDir=KSystemPath;
 	delDir[0]=(TText)gDriveToTest;
 	r=TheFs.RmDir(delDir);
-	test_Value(r, r == KErrNone || r==KErrPathNotFound || r==KErrNotFound);
+	test(r==KErrNone || r==KErrPathNotFound || r==KErrNotFound);
 	}
 
 GLDEF_C void CallTestsL(/*TChar aDriveLetter*/)
@@ -939,12 +941,12 @@
 	sesspath[0] = (TText)gDriveToTest;
 
 	TInt r= TheFs.SetSessionPath(sesspath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	//cleanup from previous run of this test
 	RProcess tp;
 	r=tp.Create(_L("clean_prepdc.exe"),sesspath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	{
 	TRequestStatus ps;
 	tp.Logon(ps);
@@ -958,30 +960,30 @@
 	RFs fs2;
 	
 	r=fs1.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs1.SessionPath(sesspath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("session1 Path=%S"),&sesspath);
 
 	TBuf<30> privatepath;
 	r=fs1.SetSessionToPrivate(gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs1.PrivatePath(privatepath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=privatepath.Compare(KExpectedPrivatePath());
-	test_Value(r, r == 0);
+	test(r==0);
 	r=fs1.SessionPath(sesspath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=privatepath.Compare(sesspath.Mid(KPathPosition));
-	test_Value(r, r == 0);
+	test(r==0);
 	r=fs1.CreatePrivatePath(gTheDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fs1.Close();
 
 	r=fs2.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs2.SessionPath(sesspath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("session2 Path=%S"),&sesspath);
 	fs2.Close();