FCL/sf/os/kernelhwsrv: comparison kerneltest/f32test/concur/t

equal deleted inserted replaced

-:ef2a444a7410
+:b3a1d9898418
 // return true if fat on aDrive
 //
 	{
 	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);
 	}
 GLDEF_C void CreateLongName(TDes& aFileName,TInt64& aSeed,TInt aLength)
 //
 //
 	{
 	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);
 	}
 //
 	{
 	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();
 	}
 GLDEF_C void MakeFile(const TDesC& aFileName,const TDesC8& aFileContents)
 //
 	if(r!=KErrNone && r!=KErrPathNotFound)
 		{
 		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();
 	}
 GLDEF_C void MakeFile(const TDesC& aFileName,TInt anAttributes)
 //
 //
 	{
 	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)
 //
 // Set the session path and update gSessionPath
 //
 	{
 	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)
 //
 // Make a file
 // Make a directory
 //
 	{
 	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*/)
 //
 // Check aName exists
 //
 	{
 	TEntry entry;
 	TInt r=TheFs.Entry(aName,entry);
-	test(r==aResult);
+	test_Value(r, r == aResult);
 	if (aResult!=KErrNone)
 		return(0);
 	TParsePtrC nameParse(aName);
 	TParsePtrC entryParse(entry.iName);
 	TBool nameMatch=(entryParse.Name()==nameParse.Name());
 //
 	{
 	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);
 	}
 	TheFs.SetAtt(_L("\\F32-TST\\SCANTEST\\Left\\Dir3\\Dir4\\Hidden\\System"), 0, KEntryAttSystem);
 	test.Next(_L("Delete test directory"));
 	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;
 	}
 GLDEF_C void CreateTestDirectory(const TDesC& aSessionPath)
 //
 	{
 	TParsePtrC path(aSessionPath);
 	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()
 //
 // Return the current drive number
 //
 	{
 	TInt driveNum;
 	TInt r=TheFs.CharToDrive(gSessionPath[0],driveNum);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	return(driveNum);
 	}
 GLDEF_C void Format(TInt aDrive)
 //
 	TBuf<4> driveBuf=_L("?:\\");
 	driveBuf[0]=(TText)(aDrive+'A');
 	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();
 	}
 LOCAL_C void PushLotsL()
 	{
 	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)
 //		CheckMountLFFS(TheFs,driveLetter);
 	test.Title();
 	test.Start(_L("Starting tests..."));
 	r=TheFs.Connect();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	ParseCommandArguments(); //need this for drive letter to test
 	TheFs.SetAllocFailure(gAllocFailOn);
 	TTime timerC;
 	sessionp[0]=(TText)gDriveToTest;
 	test.Printf(_L("sp1=%S"),&sessionp);
 	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);
 	TheFs.SetDebugRegister(gDebugFlags);
 	TTime endTimeC;
 	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();
 	test.End();
 	test.Close();

changeset 109	b3a1d9898418
parent 0	a41df078684a
child 257	3e88ff8f41d5