--- a/kerneltest/f32test/filesystem/fat/t_tscan32.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/filesystem/fat/t_tscan32.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -11,10 +11,9 @@
 // Contributors:
 //
 // Description:
-// f32test\filesystem\fat\t_tscan32.cpp
+// f32test\scndrv\t_tscan32.cpp
 // 
-
-#define __E32TEST_EXTENSION__
+//
 
 #include <f32file.h>
 #include <e32test.h>
@@ -37,9 +36,9 @@
 
 #ifdef _DEBUG
 GLREF_D RTest test;
-GLDEF_D TInt TheFunctionNumber;	// Indicates which test to run
-GLDEF_D TInt TheOpNumber;		// Indicates which file operation to be tested
-GLDEF_D TInt TheFailCount;		
+GLDEF_D TInt TheFunctionNumber;
+GLDEF_D TInt TheOpNumber;
+GLDEF_D TInt TheFailCount;
 GLDEF_D TBool IsReset;
 GLDEF_D TFileName TestExeName=_L("?:\\T_SCANDR.EXE"); //Renaming it to fit in one root dir entry.
 GLDEF_D TFileName LogFileName=_L("?:\\T_SCANDR.LOG"); //Renaming it to fit in one root dir entry.
@@ -57,8 +56,8 @@
 const TInt KDirAttrLongMask  = KDirAttrLongName | KDirAttrDirectory | KDirAttrArchive;
 const TInt KDirLastLongEntry = 0x40;
 
-GLDEF_D TInt WriteFailValue;	// Indicates what error should return from a write failure
-								// Value assigned in t_scn32dr2 and t_scn32dr3
+GLDEF_D TInt WriteFailValue;
+
 LOCAL_C TFatBootSector BootSector;	
 LOCAL_D RRawDisk TheRawDisk;
 
@@ -80,13 +79,7 @@
 LOCAL_D HBufC8* gFatBuf  = NULL;
 LOCAL_D TInt    gFatAddr = -1;
 
-enum TFatChain
-	{
-	EChainStd,			// Cluster chain grows contiguously
-	EChainAlternate,	// Cluster chain grows forward but not contiguously
-	EChainBackwards,	// Cluster chain first goes backwards(up to 3.5kb for fat16 file) and then forwards
-	EChainForwards		// Cluster chain first goes forward (upto 3.5kb for fat16 file) and then backwards
-	};
+enum TFatChain {EChainStd,EChainAlternate,EChainBackwards,EChainForwards};
 
 LOCAL_C TBool IsInternalRam()
 //
@@ -95,7 +88,7 @@
 	{
 	TVolumeInfo v;
 	TInt r=TheFs.Volume(v,gSessionPath[0]-'A');
-	test_KErrNone(r);
+	test(r==KErrNone);
 	return(v.iDrive.iMediaAtt&KMediaAttVariableSize);
 	}
 
@@ -109,10 +102,10 @@
 	TInt r=log.Open(TheFs,LogFileName,EFileShareExclusive|EFileWrite);
 	if(r!=KErrNone)
 		test.Printf(_L("error=%d\n"),r);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TInt size;
 	r=log.Size(size);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TBuf8<16> buf;
 	buf.SetLength(4);
 	buf[0]=(TUint8)TheFunctionNumber;
@@ -120,7 +113,7 @@
 	buf[2]=(TUint8)TheFailCount;
 	buf[3]='\n';
 	r=log.Write(size,buf,buf.Length());
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("Written func=%d,op=%d,fail=%d\n"),TheFunctionNumber,TheOpNumber,TheFailCount);
 	log.Close();
 	}
@@ -148,8 +141,8 @@
 	TInt r=log.Open(TheFs,LogFileName,EFileShareExclusive);
 	if(r!=KErrNone)
 		test.Printf(_L("error in ReadLogFile()=%d\n"),r);
-	test_KErrNone(r);
-	
+	test(r==KErrNone);
+	test(r==KErrNone);
 	TInt fileSize;
 	r=log.Size(fileSize);
 	if(fileSize==0)
@@ -194,7 +187,7 @@
 */
 static void DoZeroFillMedia(TInt64 aStartPos, TInt64 aEndPos, RRawDisk& aWriter)
 {
-	test(aStartPos >=0 && aEndPos >=0 && aStartPos < aEndPos);
+    test(aStartPos >=0 && aEndPos >=0 && aStartPos < aEndPos);
     
     if(aStartPos == aEndPos)
         return;
@@ -205,7 +198,7 @@
     const TUint32 KBufSz=65536*2; //-- buffer with zeroes
     
     nRes = buf.CreateMax(KBufSz);
-    test_KErrNone(nRes);
+    test(nRes == KErrNone);
 
     buf.FillZ();
 
@@ -216,7 +209,7 @@
     
         TPtrC8 ptr(buf.Ptr(), bytesToWrite);
         nRes = aWriter.Write(aStartPos, ptr);
-        test_Value(nRes, nRes == KErrNone || nRes == KErrDiskFull);
+        test(nRes == KErrNone || nRes == KErrDiskFull);
 
         aStartPos+=bytesToWrite;
         rem-=bytesToWrite;
@@ -234,7 +227,7 @@
 	{
 
 	TInt r=TheRawDisk.Open(TheFs,gSessionPath[0]-'A');
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	TUint32 startPos = gDataStartBytes;
 	if (gDiskType == EFat32)
@@ -276,7 +269,7 @@
 	{
 	
     TInt nRes = ReadBootSector(TheFs, CurrentDrive(), KBootSectorNum<<KDefaultSectorLog2, BootSector);
-    test_KErrNone(nRes);
+    test(nRes == KErrNone);
 
     if(!BootSector.IsValid())
         {
@@ -330,7 +323,7 @@
 	if (!gFatBuf)
 		{
 		gFatBuf=HBufC8::New(gBytesPerCluster);
-		test_NotNull(gFatBuf);
+		test(gFatBuf!=NULL);
 		gFatAddr = -1;
 		}
 
@@ -346,10 +339,10 @@
 		if (gFatAddr < 0 || pos < gFatAddr || pos >= gFatAddr + gBytesPerCluster)
 			{
 			TPtr8 ptr=gFatBuf->Des();
-			TInt r=TheRawDisk.Open(TheFs,gSessionPath[0]-'A');
-			test_KErrNone(r);
+		TInt r=TheRawDisk.Open(TheFs,gSessionPath[0]-'A');
+			test(r==KErrNone);
 			r=TheRawDisk.Read(pos, ptr);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			TheRawDisk.Close();
 			gFatAddr = pos;
 			}
@@ -638,12 +631,12 @@
 		if (GetFatEntry(cluster, aFat) != 0)
 			{
 			HBufC8* buf=HBufC8::New(gBytesPerCluster);
-			test_NotNull(buf);
+			test(buf!=NULL);
 			TPtr8 ptr=buf->Des();
 			TInt r=TheRawDisk.Open(TheFs,gSessionPath[0]-'A');
-			test_KErrNone(r);
+			test(r==KErrNone);
 			r=TheRawDisk.Read(ClusterToByte(cluster), ptr);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			TheRawDisk.Close();
 			RDebug::Print(_L("Cluster %d @ 0x%08X:"), cluster, ClusterToByte(cluster));
 			DumpDirCluster(ptr.Ptr());
@@ -727,7 +720,7 @@
 		dir[1]=TUint16(count/26+'a');
 		dir[2]=TUint16(count%26+'a');
 		r=TheFs.MkDir(dir);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		entriesSoFar+=2;
 		++count;
 		}
@@ -752,7 +745,7 @@
 		dir[1]=TUint16(count/26+'a');
 		dir[2]=TUint16(count%26+'a');
 		r=TheFs.RmDir(dir);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		entriesSoFar-=2;
 		++count;
 		}
@@ -774,7 +767,7 @@
 	{
 	TEntry entry;
 	TInt r=TheFs.Entry(aName,entry);
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	return(r==KErrNone?(TBool)ETrue:(TBool)EFalse);
 	}
 
@@ -813,7 +806,7 @@
 //
 	{
 	TInt r=TheFs.Entry(aName,aEntry);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 LOCAL_C TBool IsSameEntryDetails(TEntry aOldEntry,TEntry aNewEntry)
@@ -836,9 +829,9 @@
 	TInt size1,size2;
 	size1=size2=0;
 	TInt r=file1.Create(TheFs,aNameOne,EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=file2.Create(TheFs,aNameTwo,EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	// one entry for file1 for every 40 entries for file2
 	// if file 1 subseqently deleted then 7 entries available
 	// in that fat sector - ~3.5kb file size - for fat16
@@ -850,15 +843,15 @@
 			{
 			size1+=gBytesPerCluster;
 			r=file1.SetSize(size1);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			first=EFalse;
 			--entries;
 			}
 		else
 			{
 			size2+=gBytesPerCluster*ratio;
-			r=file2.SetSize(size2);
-			test_KErrNone(r);
+			r=file1.SetSize(size1);
+			test(r==KErrNone);
 			first=ETrue;
 			entries-=ratio;
 			}
@@ -911,7 +904,7 @@
 		TFileName fullName(aName);
 		fullName.Append(fn);
 		TInt r = TheFs.Delete(fullName);
-		test_KErrNone(r);
+		test(r == KErrNone);
 		entry += 1 + (fn.Length() + 12) / 13;
 		}
 	RDebug::Print(_L("CleanDirectory(%S, %d)"), &aName, aClusters);
@@ -946,7 +939,7 @@
 		fullName.Append(fn);
 		RFile file;
 		TInt r = file.Create(TheFs,fullName,EFileShareAny);
-		test_KErrNone(r);
+		test(r == KErrNone);
 		file.Close();
 		entry += 1 + (fn.Length() + 12) / 13;
 		}
@@ -961,7 +954,7 @@
 //
 	{
 	TInt r=TheFs.Delete(_L("\\fat\\file2"));
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||KErrNotFound);
 	if(aIsDir)
 		return(TheFs.RmDir(aName));
 	else
@@ -975,7 +968,7 @@
 //
 	{
 	TInt r=DeleteAlternateEntry(aName,aIsDir);
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	RFile file;
 	if(aIsDir)
 		{
@@ -989,17 +982,17 @@
 		if(r!=KErrNone)
 			return(r);
 		r=file.SetSize(1); //ensure file allocated a start cluster
-		test_KErrNone(r);
+		test(r==KErrNone);
 		}
 	CreateAlternate(_L("\\fat\\file1"),_L("\\fat\\file2"));
 	r=TheFs.Delete(_L("\\fat\\file1"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if(aIsDir)
 		ExpandDirectory(aName,aSize);
 	else
 		{
 		r=file.SetSize(aSize);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		file.Close();
 		}
 	return(KErrNone);
@@ -1011,11 +1004,11 @@
 //
 	{
 	TInt r=TheFs.Delete(_L("\\fat\\file2"));
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	r=TheFs.Delete(_L("\\fat\\file4"));
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	r=TheFs.Delete(_L("\\fat\\file5"));
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	if(aIsDir)
 		r=TheFs.RmDir(aName);
 	else
@@ -1030,16 +1023,16 @@
 //	
 	{
 	TInt r=DeleteForwardEntry(aName,aIsDir);
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	RFile file1,file2,entry;
 	r=file1.Create(TheFs,_L("\\fat\\file1"),EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=file1.SetSize(EntriesPerFatSector()*gBytesPerCluster);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=file2.Create(TheFs,_L("\\fat\\file2"),EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=file2.SetSize(EntriesPerFatSector()*gBytesPerCluster);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if(aIsDir)
 		{
 		r=TheFs.MkDir(aName);
@@ -1052,27 +1045,27 @@
 		if(r!=KErrNone)
 			return(r);
 		r=entry.SetSize(1);	// ensure entry has start cluster allocated
-		test_KErrNone(r);
+		test(r==KErrNone);
 		}
 	CreateAlternate(_L("\\fat\\file3"),_L("\\fat\\file4"));
 	RFile file5;
 	r=file5.Create(TheFs,_L("\\fat\\file5"),EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=file5.SetSize(EntriesPerFatSector()*gBytesPerCluster*2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file1.Close();
 	file2.Close();
 	file5.Close();
 	r=TheFs.Delete(_L("\\fat\\file1"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(_L("\\fat\\file3"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if(aIsDir)
 		ExpandDirectory(aName,aSize);
 	else
 		{
 		r=entry.SetSize(aSize);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		entry.Close();
 		}
 	return(KErrNone);
@@ -1084,9 +1077,9 @@
 //
 	{
 	TInt r=TheFs.Delete(_L("\\fat\\file2"));
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	r=TheFs.Delete(_L("\\fat\\file3"));
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	if(aIsDir)
 		r=TheFs.RmDir(aName);
 	else
@@ -1101,7 +1094,7 @@
 //
 	{
 	TInt r=DeleteBackwardEntry(aName,aIsDir);
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	CreateAlternate(_L("\\fat\\file1"),_L("\\fat\\file2"));
 	RFile entry;
 	if(aIsDir)
@@ -1116,22 +1109,22 @@
 		if(r!=KErrNone)
 			return(r);
 		r=entry.SetSize(1);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		}
 	RFile file3;
 	r=file3.Create(TheFs,_L("\\fat\\file3"),EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=file3.SetSize(EntriesPerFatSector()*gBytesPerCluster);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(_L("\\fat\\file1"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file3.Close();
 	if(aIsDir)
 		ExpandDirectory(aName,aSize);
 	else
 		{
 		r=entry.SetSize(aSize);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		entry.Close();
 		}
 	return(KErrNone);	
@@ -1154,7 +1147,7 @@
 //
 	{
 	TInt r=DeleteStdEntry(aName,aIsDir);
-	test_Value(r, r==KErrNone||r==KErrNotFound);
+	test(r==KErrNone||r==KErrNotFound);
 	if(aIsDir)
 		{
 		r=TheFs.MkDir(aName);
@@ -1169,12 +1162,12 @@
 		if(r==KErrNone)
 			{
 			r=file.SetSize(aSize);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			}
 		else if(r==KErrAlreadyExists)
 			{
 			TInt res =file.Open(TheFs,aName,EFileShareAny);
-			test_KErrNone(res);
+			test(res==KErrNone);
 			}
 		else
 			return(r);
@@ -1225,28 +1218,28 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=CreateEntry(aName,EFalse,aChain,aFileSize);
-		test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+		test(r==KErrNone||r==KErrAlreadyExists);
 		if(IsReset)
 			{
 			++TheFailCount;
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.Delete(aName);
 		if(r==KErrNone)
 			break;
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		++failCount;
 		}
 	r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(!EntryExists(aName));
 	++TheOpNumber;
 	TheFailCount=0;
@@ -1281,18 +1274,18 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=CreateEntry(aName,ETrue,aChain,aDirSize);
-		test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+		test(r==KErrNone||r==KErrAlreadyExists);
 		if(IsReset)
 			{
 			++TheFailCount;
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.RmDir(aName);
 		if(r==KErrNone)
 			break;
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
 		RDebug::Print(_L("%6d: ScanDrive = %d"), __LINE__, r);
 		if (r != KErrNone)
@@ -1301,16 +1294,16 @@
 			DumpFat();
 			DumpData(NULL, 0, 200);
 		}
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
 		RDebug::Print(_L("%6d: CheckDisk = %d"), __LINE__, r);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		++failCount;
 		}
 	r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(!EntryExists(aName));
 	++TheOpNumber;
 	TheFailCount=0;
@@ -1328,31 +1321,31 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=DeleteEntry(aName,ETrue,EChainStd);
-		test_Value(r, r==KErrNone||r==KErrNotFound);
+		test(r==KErrNone||r==KErrNotFound);
 		if(IsReset)
 			{
 			++TheFailCount;
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.MkDir(aName);
 		if(r==KErrNone)
 			break;
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		++failCount;
 		}
 	r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(EntryExists(aName));
 	r=DeleteEntry(aName,ETrue,EChainStd);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	++TheOpNumber;
 	TheFailCount=0;
 	}
@@ -1370,9 +1363,9 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=CreateEntry(aOldName,aIsDir,aChain,aSize);
-		test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+		test(r==KErrNone||r==KErrAlreadyExists);
 		r=DeleteEntry(aNewName,aIsDir,aChain);
-		test_Value(r, r==KErrNone||r==KErrNotFound);
+		test(r==KErrNone||r==KErrNotFound);
 		GetEntryDetails(aOldName,oldEntryInfo);
 		if(IsReset)
 			{
@@ -1380,29 +1373,34 @@
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.Rename(aOldName,aNewName);
 		if(r==KErrNone)
 			break;
-		test_Equal(WriteFailValue,r);
+		if(r!=WriteFailValue)
+			{
+			test.Printf(_L("r=%d\n"),r);
+			test(EFalse);
+			}
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		// no start cluster if aSize==0
 		if(aSize!=0)
 			test(OneEntryExists(aOldName,aNewName));
 		++failCount;
 		}
 	r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(EntryExists(aNewName) && !EntryExists(aOldName));
 	GetEntryDetails(aNewName,newEntryInfo);
 	test(IsSameEntryDetails(oldEntryInfo,newEntryInfo));
 	r=DeleteEntry(aNewName,aIsDir,aChain);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	++TheOpNumber;
 	TheFailCount=0;
 	}
@@ -1424,16 +1422,16 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=CreateEntry(aOldName,EFalse,aChain,aFileSize);
-		test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+		test(r==KErrNone||r==KErrAlreadyExists);
 		if(aBothExist)
 			{
 			r=CreateEntry(aNewName,EFalse,aChain,aFileSize);
-			test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+			test(r==KErrNone||r==KErrAlreadyExists);
 			}
 		else
 			{
 			r=DeleteEntry(aNewName,EFalse,aChain);
-			test_Value(r, r==KErrNone||r==KErrNotFound);
+			test(r==KErrNone||r==KErrNotFound);
 			}
 		GetEntryDetails(aOldName,oldEntryInfo);
 		if(IsReset)
@@ -1442,15 +1440,15 @@
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.Replace(aOldName,aNewName);
 		if(r==KErrNone)
 			break;
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		if(!aBothExist && aFileSize!=0)
 			test(OneEntryExists(aOldName,aNewName));
 		else if(aBothExist)
@@ -1458,14 +1456,14 @@
 		++failCount;
 		}
 	r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(EntryExists(aNewName) && !EntryExists(aOldName));
 	GetEntryDetails(aNewName,newEntryInfo);
 	test(IsSameEntryDetails(oldEntryInfo,newEntryInfo));
 	r=DeleteEntry(aNewName,EFalse,aChain);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	++TheOpNumber;
 	TheFailCount=0;
 	}
@@ -1482,35 +1480,35 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=DeleteEntry(aName,EFalse,EChainStd);
-		test_Value(r, r==KErrNone||r==KErrNotFound);
+		test(r==KErrNone||r==KErrNotFound);
 		if(IsReset)
 			{
 			++TheFailCount;
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		RFile file;
 		r=file.Create(TheFs,aName,EFileShareAny);
 		if(r==KErrNone)
 			{
 			r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			file.Close();
 			break;
 			}
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		++failCount;
 		}
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(EntryExists(aName));
 	r=DeleteEntry(aName,EFalse,EChainStd);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	++TheOpNumber;
 	TheFailCount=0;
 	}
@@ -1533,28 +1531,28 @@
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		RFile file;
  		r=file.Temp(TheFs,aPath,temp,EFileShareAny);
 		if(r==KErrNone)
 			{
 			r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			file.Close();
 			break;
 			}
 		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		++failCount;
 		}
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(EntryExists(temp));
 	r=DeleteEntry(temp,EFalse,EChainStd);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	++TheOpNumber;
 	TheFailCount=0;
 	}
@@ -1572,9 +1570,9 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=CreateEntry(aOldName,EFalse,aChain,aFileSize);
-		test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+		test(r==KErrNone||r==KErrAlreadyExists);
 		r=DeleteEntry(aNewName,EFalse,aChain);
-		test_Value(r, r==KErrNone||r==KErrNotFound);
+		test(r==KErrNone||r==KErrNotFound);
 		GetEntryDetails(aOldName,oldEntryInfo);
 		if(IsReset)
 			{
@@ -1583,34 +1581,34 @@
 			}
 		RFile file;
 		r=file.Open(TheFs,aOldName,EFileShareExclusive|EFileWrite);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=file.Rename(aNewName);
 		if(r==KErrNone)
 			{
 			r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			file.Close();
 			break;
 			}
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		file.Close();
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		if(aFileSize)
 			test(OneEntryExists(aOldName,aNewName));
 		++failCount;
 		}
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(EntryExists(aNewName) && !EntryExists(aOldName));
 	GetEntryDetails(aNewName,newEntryInfo);
 	test(IsSameEntryDetails(oldEntryInfo,newEntryInfo));
 	r=DeleteEntry(aNewName,EFalse,aChain);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	++TheOpNumber;
 	TheFailCount=0;
 	}
@@ -1629,12 +1627,12 @@
 		if(aAlreadyExists)
 			{
 			r=CreateEntry(aName,EFalse,aChain,aFileSize);
-			test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+			test(r==KErrNone||r==KErrAlreadyExists);
 			}
 		else
 			{
 			r=DeleteEntry(aName,EFalse,aChain);
-			test_Value(r, r==KErrNone||r==KErrNotFound);
+			test(r==KErrNone||r==KErrNotFound);
 			}
 		if(IsReset)
 			{
@@ -1642,28 +1640,28 @@
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		RFile file;
 		r=file.Replace(TheFs,aName,EFileShareAny);
 		if(r==KErrNone)
 			{
 			r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			file.Close();
 			break;
 			}
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		++failCount;
 		}
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(EntryExists(aName));
 	r=DeleteEntry(aName,EFalse,aChain);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if(!aAlreadyExists)
 		{
 		++TheOpNumber;
@@ -1689,54 +1687,54 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=CreateEntry(aName,EFalse,aChain,aOldFileSize);
-		test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+		test(r==KErrNone||r==KErrAlreadyExists);
 		if(IsReset)
 			{
 			++TheFailCount;
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		RFile file;
 		r=file.Open(TheFs,aName,EFileShareAny|EFileWrite);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=file.SetSize(aNewFileSize);
 		// close the file before testing the return value!
 		file.Close();
 		if(r==KErrNone)
 			{
 			r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			file.Close();
 			break;
 			}
 		file.Close();
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=file.Open(TheFs,aName,EFileShareAny|EFileWrite);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		TInt size;
 		r=file.Size(size);
-		test_KErrNone(r);
-		test_Value(size, size==aNewFileSize||size==aOldFileSize);
+		test(r==KErrNone);
+		test(size==aNewFileSize||size==aOldFileSize);
 		file.Close();
 		++failCount;
 		}
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	RFile file;
 	r=file.Open(TheFs,aName,EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TInt fileSize;
 	r=file.Size(fileSize);
-	test_KErrNone(r);
-	test_Equal(aNewFileSize,fileSize);
+	test(r==KErrNone);
+	test(aNewFileSize==fileSize);
 	file.Close();
 	r=DeleteEntry(aName,EFalse,aChain);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	++TheFunctionNumber;
 	TheFailCount=0;
 	}
@@ -1753,7 +1751,7 @@
 	TInt newSize=(aFileSize>=aPos+aLength)?aFileSize:aPos+aLength;
 	HBufC8* desPtr;
 	desPtr=HBufC8::New(aLength);
-	test_NotNull(desPtr);
+	test(desPtr!=NULL);
 	TPtr8 des=desPtr->Des();
 	des.SetLength(aLength);
 	InitialiseWriteBuffer(des);
@@ -1761,64 +1759,64 @@
 		{
 		test.Printf(_L("failCount=%d\n"),failCount);
 		r=CreateEntry(aName,EFalse,aChain,aFileSize);
-		test_Value(r, r==KErrNone||r==KErrAlreadyExists);
+		test(r==KErrNone||r==KErrAlreadyExists);
 		if(IsReset)
 			{
 			++TheFailCount;
 			WriteLogFile();
 			}
 		r=SetWriteFailOn(failCount);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		RFile file;
 		r=file.Open(TheFs,aName,EFileShareAny|EFileWrite);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=file.Write(aPos,des,aLength);
 		if(r==KErrNone)
 			{
 			r=TheFs.ControlIo(gSessionPath[0]-'A',KControlIoWriteFailOff);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			file.Close();
 			break;
 			}
-		test_Equal(WriteFailValue,r);
+		test(r==WriteFailValue);
 		file.Close();
 		r=TheFs.ScanDrive(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		r=TheFs.CheckDisk(gSessionPath);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		file.Open(TheFs,aName,EFileShareAny);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		TInt fileSize;
 		r=file.Size(fileSize);
 		// with fair scheduling enabled it's possible for the file 
 		// size to grow even if the write appears to have failed...
-//		test_Value(fileSize, fileSize==aFileSize||fileSize==newSize);
-		test_Value(fileSize, fileSize>=aFileSize && fileSize <= newSize);
+//		test(fileSize==aFileSize||fileSize==newSize);
+		test(fileSize>=aFileSize && fileSize <= newSize);
 
 		file.Close();
 		++failCount;
 		}
 	r=TheFs.CheckDisk(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	RFile file;
 	r=file.Open(TheFs,aName,EFileShareAny);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TInt fileSize;
 	r=file.Size(fileSize);
-	test_KErrNone(r);
-	test_Equal(newSize,fileSize);
+	test(r==KErrNone);
+	test(newSize==fileSize);
 	HBufC8* desPtr2;
 	desPtr2=HBufC8::New(aLength);
-	test_NotNull(desPtr2);
+	test(desPtr2!=NULL);
 	TPtr8 des2=desPtr2->Des();
 	des2.SetLength(aLength);
 	r=file.Read(aPos,des2,des2.Length());
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=des2.Compare(des);
-	test_KErrNone(r);
+	test(r==0);
 	file.Close();
 	r=DeleteEntry(aName,EFalse,aChain);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	delete desPtr;
 	delete desPtr2;
 	++TheFunctionNumber;
@@ -1987,7 +1985,7 @@
 	ClearDiskData();
 
 	r=TheFs.SetSessionPath(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	switch(TheFunctionNumber)
 		{
@@ -1995,15 +1993,15 @@
 		case(1):{
 				TestOperation1();
 				r=TheFs.MkDir(_L("\\fat\\"));
-				test_KErrNone(r);
+				test(r==KErrNone);
 				r=TheFs.MkDir(_L("\\test\\"));
-				test_KErrNone(r);
+				test(r==KErrNone);
 				r=TheFs.MkDir(_L("\\ANother\\"));
-				test_KErrNone(r);
+				test(r==KErrNone);
 				r=TheFs.MkDir(_L("\\test\\subdir1\\"));
-				test_KErrNone(r);
+				test(r==KErrNone);
 				r=TheFs.MkDir(_L("\\test\\subdir2\\"));
-				test_KErrNone(r);}
+				test(r==KErrNone);}
 		case(2):{
 				TestOperation2();
 				// add some filler files
@@ -2051,15 +2049,15 @@
 	DeleteEntry(_L("\\test\\subdir1\\FillerTwo"),EFalse,EChainStd);
 	DeleteEntry(_L("\\test\\subdir1\\FillerOne"),EFalse,EChainStd);
 	r=TheFs.RmDir(_L("\\test\\subdir2\\"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.RmDir(_L("\\test\\subdir1\\"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.RmDir(_L("\\ANother\\"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.RmDir(_L("\\test\\"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.RmDir(_L("\\fat\\"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (gFatBuf)
 		{
 		delete gFatBuf;