diff -r 5e441a173c63 -r d9f1e5bfe28c kerneltest/f32test/concur/t_cfsmain.cpp
--- a/kerneltest/f32test/concur/t_cfsmain.cpp	Mon May 24 18:45:46 2010 +0100
+++ b/kerneltest/f32test/concur/t_cfsmain.cpp	Thu Jun 10 11:48:01 2010 +0100
@@ -130,7 +130,7 @@
 	{
 	TFileName f;
 	TInt r=aFsSession.FileSystemName(f,aDrive);
-	test(r==KErrNone || r==KErrNotFound);
+	test_Value(r, r == KErrNone || r==KErrNotFound);
 	return (f.CompareF(KFatName)==0);
 	}
 
@@ -219,7 +219,7 @@
 
 	TEntry entry;
 	TInt r=TheFs.Entry(aName,entry);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test(entry.iAtt==anAttributes);
 	if (aModified!=TTime(0))
 		test(entry.iModified==aModified);
@@ -284,20 +284,20 @@
 
 	RFile file;
 	TInt r=file.Replace(TheFs,aFileName,0);
-	test(r==KErrNone || r==KErrPathNotFound);
+	test_Value(r, r == KErrNone || r==KErrPathNotFound);
 	if (r==KErrPathNotFound)
 		{
 		r=TheFs.MkDirAll(aFileName);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		r=file.Replace(TheFs,aFileName,0);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		}
 	TCheckedUid checkedUid(aUidType);
 	TPtrC8 uidData((TUint8*)&checkedUid,sizeof(TCheckedUid));
 	r=file.Write(uidData);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r=file.Write(aFileContents);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 	}
 
@@ -314,16 +314,16 @@
 		test.Printf(_L("ERROR: r=%d"),r);
 		test(EFalse);
 		}
-	test(r==KErrNone || r==KErrPathNotFound);
+	test_Value(r, r == KErrNone || r==KErrPathNotFound);
 	if (r==KErrPathNotFound)
 		{
 		r=TheFs.MkDirAll(aFileName);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		r=file.Replace(TheFs,aFileName,0);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		}
 	r=file.Write(aFileContents);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 	}
 
@@ -335,17 +335,17 @@
 
 	RFile file;
 	TInt r=file.Replace(TheFs,aFileName,0);
-	test(r==KErrNone || r==KErrPathNotFound);
+	test_Value(r, r == KErrNone || r==KErrPathNotFound);
 	if (r==KErrPathNotFound)
 		{
 		r=TheFs.MkDirAll(aFileName);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		r=file.Replace(TheFs,aFileName,0);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		}
 	file.Close();
 	r=TheFs.SetAtt(aFileName,anAttributes,0);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	}
 
 GLDEF_C void SetSessionPath(const TDesC& aPathName)
@@ -355,9 +355,9 @@
 	{
 
 	TInt r=TheFs.SetSessionPath(aPathName);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r=TheFs.SessionPath(gSessionPath);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	}
 
 GLDEF_C void MakeFile(const TDesC& aFileName)
@@ -376,7 +376,7 @@
 	{
 
 	TInt r=TheFs.MkDirAll(aDirName);
-	test(r==KErrNone || r==KErrAlreadyExists);
+	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
 	}
 
 GLDEF_C TInt CheckFileExists(const TDesC& aName,TInt aResult,TBool aCompRes/*=ETrue*/)
@@ -387,7 +387,7 @@
 
 	TEntry entry;
 	TInt r=TheFs.Entry(aName,entry);
-	test(r==aResult);
+	test_Value(r, r == aResult);
 	if (aResult!=KErrNone)
 		return(0);
 	TParsePtrC nameParse(aName);
@@ -406,15 +406,15 @@
 
 	RFile f;
 	TInt r=f.Open(TheFs,aName,EFileRead);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	HBufC8* testBuf=HBufC8::NewL(aContents.Length());
 	test(testBuf!=NULL);
 	TPtr8 bufPtr(testBuf->Des());
 	r=f.Read(bufPtr);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test(bufPtr==aContents);
 	r=f.Read(bufPtr);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test(bufPtr.Length()==0);
 	f.Close();
 	User::Free(testBuf);
@@ -433,12 +433,12 @@
 	CFileMan* fMan=CFileMan::NewL(TheFs);
 	test(fMan!=NULL);
 	TInt r=TheFs.SessionPath(gSessionPath);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r=TheFs.CheckDisk(gSessionPath);
 	if (r!=KErrNone && r!=KErrNotSupported)
 		ReportCheckDiskFailure(r);
 	r=fMan->RmDir(gSessionPath);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	delete fMan;
 	}
 
@@ -451,11 +451,11 @@
 	test(path.DrivePresent()==EFalse);
 
 	TInt r=TheFs.SetSessionPath(aSessionPath);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r=TheFs.SessionPath(gSessionPath);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r=TheFs.MkDirAll(gSessionPath);
-	test(r==KErrNone || r==KErrAlreadyExists);
+	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
 	}
 
 GLDEF_C TInt CurrentDrive()
@@ -466,7 +466,7 @@
 
 	TInt driveNum;
 	TInt r=TheFs.CharToDrive(gSessionPath[0],driveNum);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	return(driveNum);
 	}
 
@@ -482,11 +482,11 @@
 	RFormat format;
 	TInt count;
 	TInt r=format.Open(TheFs,driveBuf,EHighDensity,count);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	while(count)
 		{
 		TInt r=format.Next(count);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		}
 	format.Close();
 	}
@@ -512,10 +512,10 @@
 	gSessionPath=_L("?:\\F32-TST\\");
 	TChar driveLetter;
 	TInt r=TheFs.DriveToChar(aDrive,driveLetter);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	gSessionPath[0]=(TText)driveLetter;
 	r=TheFs.SetSessionPath(gSessionPath);
-	test(r==KErrNone);
+	test_KErrNone(r);
 
 // !!! Disable platform security tests until we get the new APIs
 //	if(User::Capability() & KCapabilityRoot)
@@ -624,7 +624,7 @@
 	test.Start(_L("Starting tests..."));
 
 	r=TheFs.Connect();
-	test(r==KErrNone);
+	test_KErrNone(r);
 
 	ParseCommandArguments(); //need this for drive letter to test
 
@@ -649,7 +649,7 @@
 
 	TInt theDrive;
 	r=TheFs.CharToDrive(gDriveToTest,theDrive);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	// set up debug register
 	test.Printf(_L("debug register = 0x%X"), gDebugFlags);
@@ -665,7 +665,7 @@
 	endTimeC.HomeTime();
 	TTimeIntervalSeconds timeTakenC;
 	r=endTimeC.SecondsFrom(timerC,timeTakenC);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("Time taken for test = %d seconds\n"),timeTakenC);
 	TheFs.SetAllocFailure(gAllocFailOff);
 	TheFs.Close();