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

equal deleted inserted replaced

-:c1f20ce4abcf
+:3e88ff8f41d5
 // Description:
 // f32test\server\t_notifier.cpp
 //
 //
-#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include <e32svr.h>
 #include <hal.h>
 #include "t_server.h"
 // We should receive an EMediaChange notification even though we did not register for it
 void TestMediaCardNotificationWhenNotRegisteredForIt()
 	{
 	RFs fs;
 	TInt r = fs.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	CFsNotify* notify = NULL;
 	TRAP(r,notify= CFsNotify::NewL(fs,KMinNotificationBufferSize));
 	TBuf<40> path;
 	TBuf<20> filename;
 	filename.Append(_L("media.change1"));
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("*****************************************************************\n"));
 	test.Printf(_L("Waiting 10 seconds.\n"));
 	test.Printf(_L("This is a MANUAL test, it requires the removal of the media card.\n"));
 	test.Printf(_L("PLEASE REMOVE THE MEDIA CARD. (DriveNumber %d)\n"),globalDriveNum);
 	test.Printf(_L("Or press Ctrl + F5 on the emulator.\n"));
 	test.Printf(_L("*****************************************************************\n"));
 	RTimer timer1;
 	r = timer1.CreateLocal();
-	test_KErrNone(r);
+	test(r == KErrNone);
 	TRequestStatus timeout;
 	TTimeIntervalMicroSeconds32 time = 10000000;
 	timer1.After(timeout,time);
 	User::WaitForRequest(timeout,status);
 	test(status.Int() != KRequestPending);
 	TBuf<2> drive;
 	drive.Append((TChar)gDriveToTest);
 	drive.Append(_L(":"));
 	TPtrC drivePtr;
 	r = notification->Path(drivePtr);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = drivePtr.Compare(drive);
-	test_Value(r, r == 0);
+	test(r==0);
 	test.Printf(_L("*****************************************************************\n"));
 	test.Printf(_L("Waiting 10 seconds.\n"));
 	test.Printf(_L("This is a MANUAL test, it requires the insertion of the media card.\n"));
 	test.Printf(_L("PLEASE INSERT THE MEDIA CARD. (DriveNumber %d)\n"),globalDriveNum);
 	if(notification == NULL)
 		{
 		notify->RequestNotifications(status);
 		RTimer timer2;
 		r = timer2.CreateLocal();
-		test_KErrNone(r);
+		test(r == KErrNone);
 		TRequestStatus timeout2;
 		timer2.After(timeout2,time);
 		User::WaitForRequest(timeout2,status);
 		test(status.Int() != KRequestPending);
 		notification = notify->NextNotification();
 // and then checks if the second one still works
 TInt TestClientRemovalL()
 	{
 	RFs fs;
 	TInt r = fs.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	CFsNotify* notify1 = NULL;
 	CFsNotify* notify2 = NULL;
 	TRAP(r,notify1= CFsNotify::NewL(fs,KMinNotificationBufferSize);
 		   notify2= CFsNotify::NewL(fs,KMinNotificationBufferSize);
 		);
 	if(r!=KErrNone)
 		{
 		delete notify1;
 		delete notify2;
-		test_KErrNone(r);
+		test(r==KErrNone);
 		}
 	TBuf<40> path;
 	path.Append((TChar)gDriveToTest);
 	path.Append(_L(":\\F32-TST\\T_NOTIFIER\\"));
 	TBuf<40> fullname;
 	fullname.Append(path);
 	fullname.Append(filename);
 	r = notify1->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = notify2->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	delete notify1; //Delete notify1 and ensure we still get notification on notify2
 	TRequestStatus status;
 	r = notify2->RequestNotifications(status);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	RFile file;
 	file.Replace(fs,fullname,EFileWrite); //Replace produces Create notification
 	file.Close();
 	RTimer tim;
 	r = tim.CreateLocal();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus timStatus;
 	TTimeIntervalMicroSeconds32 time = 10000000; //10 seconds
 	tim.After(timStatus,time);
 	User::WaitForRequest(status,timStatus);
 	test(status!=KRequestPending);
 	r = fs.Delete(fullname);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	delete notify2;
 	tim.Close();
 	fs.Close();
 	return KErrNone;
 	fs.Connect();
 	CFsNotify* notify = NULL;
 	TRAPD(r,notify = CFsNotify::NewL(fs,KMinNotificationBufferSize););
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(notify!=NULL);
 	TBuf<40> path;
 	path.Append((TChar)gDriveToTest);
 	path.Append(_L(":\\"));
 	TBuf<15> filename;
 	filename.Append(_L("*"));
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	RFile file;
 	TBuf<40> filePath;
 	filePath.Append((TChar)gDriveToTest);
 	filePath.Append(_L(":\\file.root"));
 	r = file.Replace(fs,filePath,EFileRead);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file.Close();
 	TRequestStatus s2;
 	RTimer tim;
 	test(tim.CreateLocal()==KErrNone);
 		    safe_test(multipleTestDoer,r,__LINE__,pkgDoer.iLineCall);
 		    file.Close();
 		    CFileMan* cfman = NULL;
 		    TRAP(r, cfman = CFileMan::NewL(fs);)
-		    test_KErrNone(r);
+		    test(r == KErrNone);
 test(cfman != NULL);
 TBuf<40> unmonitored_path;
 unmonitored_path.Append(gDriveToTest);
 unmonitored_path.Append(_L(":\\F32-TST\\"));
 unmonitored_path.Append(pkgDoer.iString);
 	{
 	RProcess process;
 	TUidType uid;
 	TPtrC command((TText*)&gDriveToTest,1);
 	TInt r = process.Create(aProcessName,command,uid);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	process.Resume();
 	TRequestStatus s1;
 	TRequestStatus s2;
 	RTimer tim;
 	r = tim.CreateLocal();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TTimeIntervalMicroSeconds32 delay = 5000000; //5 seconds
 	tim.After(s1,delay);
 	process.Logon(s2);
 	User::WaitForRequest(s1,s2);
 	test(s2.Int()!=KRequestPending);
 	User::LeaveIfError(package.iBarrier.CreateLocal(0));
 	RThread watcher;
 	RThread doer;
 	TInt r = watcher.Create(_L("TestTwoNotificationsWatcherThread"),MultipleNotificationsTFWatcher,KDefaultStackSize,KMinHeapSize,KMaxHeapSize,&package);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = doer.Create(_L("TestTwoNotificationsDoerThread"),TwoNotificationsTFDoer,KDefaultStackSize,KMinHeapSize,KMaxHeapSize,&package);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Next(_L("TestTwoNotifications - Resume Watcher"));
 	watcher.Resume();
 	test.Next(_L("TestTwoNotifications - Wait for Watcher to be ready"));
 	package.iBarrier.Wait(); //Wait till Watcher has requested notification
 	test.Next(_L("TestTwoNotifications - Resume Doer"));
 	User::LeaveIfError(package.iBarrier2.CreateLocal(0));
 	RThread watcher;
 	RThread doer;
 	TInt r = watcher.Create(_L("TestCancelNotification-WatcherThread"),TestCancelNotificationWatcher,KDefaultStackSize*2,KMinHeapSize,KMaxHeapSize,&package);
-	test_KErrNone(r);
+	test(r == KErrNone);
 	r = doer.Create(_L("TestCancelNotification-DoerThread"),SimpleSingleNotificationTFDoer,KDefaultStackSize*2,KMinHeapSize,KMaxHeapSize,&package);
-	test_KErrNone(r);
+	test(r == KErrNone);
 	test.Printf(_L("TestCancelNotificationL - Watcher.Resume()"));
 	watcher.Resume();
 	test.Printf(_L("TestCancelNotificationL - Waiting on package.iBarrier.Wait()"));
 	package.iBarrier.Wait();	//W1 - Wait until Watcher has created CFsNotify
 	test.Printf(_L("TestCancelNotificationL -Doer Resume"));
 	test.Next(_L("TestCancelNotification - Wait for watcher thread death"));
 	watcher.Logon(status);
 	RTimer tim;
 	r = tim.CreateLocal();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus timStatus;
 	TTimeIntervalMicroSeconds32 time = 10000000; //10 seconds
 	tim.After(timStatus,time);
 			TBuf<20> filename;
 			filename.Append(_L("session.close"));
 			RDebug::Printf("TestSessionCloseTF - Case 2 - Add Notification\n");
 			r = notify->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-			test_KErrNone(r);
+			test(r==KErrNone);
 			RDebug::Printf("TestSessionCloseTF - Case 2 - Fs.Close\n");
 			fs.Close();
 			CleanupStack::PushL(notify);
 	TRequestStatus status;
 	thread.Logon(status);
 	User::WaitForRequest(status);
 	test.Printf(_L("Kern-Exec 0 is EXPECTED\n"));
 	TInt err = thread.ExitReason();
-	test_KErrNone(err);
+	test(err == KErrNone);
 	TExitType et = thread.ExitType();
 	test(et == EExitPanic);
 	CLOSE_AND_WAIT(thread);
 	sem.Close();
 	}
 	//80*7 = 560.
 	// -4 means we should get 6 notifications
 	//Except the first one will still be in the buffer
 	// (as we've not called RequestNotification yet) so we'll only actually get 5.
 	TRAPD(r, notify = CFsNotify::NewL(fs,(80*7)-4));
-	test_KErrNone(r);
+	test(r == KErrNone);
 	User::LeaveIfNull(notify);
 	notify->AddNotification(TFsNotification::EFileChange,path,filename);
 	notify->RequestNotifications(status);
 	//Signal that we are ready for doer to start (W1)
 	 * The watcher's last notification should be an overflow
 	 */
 	test.Next(_L("TestOverflow"));
 	RFs fs;
 	TInt r = fs.Connect();
-	test_KErrNone(r);
+	test(r == KErrNone);
 	_LIT(KFileName,"over.flow");
 	SThreadPackage doerPkg;
 	doerPkg.iFileName = KFileName;
 	SThreadPackage watcher1Pkg;
 	// (W3)
 	watcher1Pkg.iBarrier.Signal();
 	RTimer tim;
 	r = tim.CreateLocal();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus timStatus;
 	test.Next(_L("TestOverflow - Wait for watcher1 thread death"));
 	TTimeIntervalMicroSeconds32 interval = 10000000; //10 seconds
 	tim.After(timStatus,interval);
 TInt HandlePostOverflow(SThreadPackage& aPackage, CFsNotify* aNotify)
 {
 TRequestStatus status;
 TInt r = aNotify->RequestNotifications(status);
-test_KErrNone(r);
+test(r == KErrNone);
 //Signal that overflow has been found (W4)
 aPackage.iBarrier.Signal();
 User::WaitForRequest(status);
 }
 notification = aNotify->NextNotification();
 if(notification == NULL)
 {
 r = aNotify->RequestNotifications(status);
-test_KErrNone(r);
+test(r == KErrNone);
 User::WaitForRequest(status);
 notification = aNotify->NextNotification();
 }
 test(notification != NULL);
 count++;
 //80*7 = 560.
 // -4 means we should get 6 notifications
 //Except the first one will still be in the buffer
 // (as we've not called RequestNotification yet) so we'll only actually get 5.
 TRAPD(r, notify = CFsNotify::NewL(fs,(80*7)-4));
-test_KErrNone(r);
+test(r == KErrNone);
 User::LeaveIfNull(notify);
 notify->AddNotification(TFsNotification::EFileChange,path,filename);
 notify->RequestNotifications(status);
 //Signal that we are ready for doer to start (W1)
 TInt TestPostOverflowNotifications()
 {
 test.Next(_L("TestPostOverflowNotifications"));
 RFs fs;
 TInt r = fs.Connect();
-test_KErrNone(r);
+test(r == KErrNone);
 _LIT(KFileName,"post.over");
 SThreadPackage doerPkg;
 doerPkg.iFileName = KFileName;
 SThreadPackage watcher1Pkg;
 path.Append((TChar)gDriveToTest);
 path.Append(_L(":\\F32-TST\\T_NOTIFIER\\"));
 path.Append(watcher1Pkg.iFileName);
 RFile file;
 r = file.Open(fs,path,EFileWrite);
-test_KErrNone(r);
+test(r==KErrNone);
 r = file.SetSize(1);
-test_KErrNone(r);
+test(r==KErrNone);
 r = file.SetSize(2);
-test_KErrNone(r);
+test(r==KErrNone);
 r = file.SetSize(3);
-test_KErrNone(r);
+test(r==KErrNone);
 file.Close();
 watcher1Pkg.iBarrier.Signal(); // Signal post operations complete (Sx)
 RTimer tim;
 r = tim.CreateLocal();
-test_KErrNone(r);
+test(r==KErrNone);
 TRequestStatus timStatus;
 test.Next(_L("TestOverflow - Wait for watcher1 thread death"));
 TTimeIntervalMicroSeconds32 interval = 10000000; //10 seconds
 tim.After(timStatus,interval);
 void TestNonDriveFilters()
 	{
 	test.Next(_L("TestNonDriveFilters"));
 	RFs fs;
 	TInt r = fs.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TDriveList drives;
 	r = fs.DriveList(drives);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	CFsNotify* notify = NULL;
 	TRAP(r,notify= CFsNotify::NewL(fs,KMinNotificationBufferSize));
 	TBuf<20> testfile;
 	testfile.Append(_L("test.file"));
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,_L(""),testfile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TBuf<40> path;
 	path.Append((TChar)gDriveToTest);
 	path.Append(_L(":\\F32-TST\\T_NOTIFIER\\"));
 	fullname.Append(path);
 	fullname.Append(testfile);
 	RFile file;
 	r = fs.MkDirAll(path);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	r = file.Replace(fs,fullname,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file.Close();
 	fs.Delete(fullname);
 	TChar testDrive = (TChar)gDriveToTest;
 			break;
 			}
 		}
 	r = fs.MkDirAll(fullname);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	r = file.Replace(fs,fullname,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file.Close();
 	RTimer timer1;
 	r = timer1.CreateLocal();
-	test_KErrNone(r);
+	test(r == KErrNone);
 	TRequestStatus timeout;
 	TTimeIntervalMicroSeconds32 time = 10000000;    //10 seconds
 	timer1.After(timeout,time);
 	User::WaitForRequest(timeout,status);
 	test(status.Int() != KRequestPending);
 	const TFsNotification* notification = notify->NextNotification();
 	test(notification != NULL);
 	TPtrC _path;
 	r = notification->Path(_path);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TChar driveletter = _path[0];
 	driveletter.UpperCase();
 	test(driveletter ==  (TChar)gDriveToTest);
 	if(notification = notify->NextNotification(), notification==NULL)
 		{
 		TRequestStatus status2;
 		r = notify->RequestNotifications(status2);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		RTimer timer2;
 		r = timer2.CreateLocal();
-		test_KErrNone(r);
+		test(r == KErrNone);
 		TRequestStatus timeout2;
 		TTimeIntervalMicroSeconds32 time2 = 10000000;    //10 seconds
 		timer2.After(timeout2,time2);
 		User::WaitForRequest(timeout2,status2);
 		test(status2.Int() != KRequestPending);
 		notification = notify->NextNotification();
 		}
 	test(notification != NULL);
 	r = notification->Path(_path);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	driveletter = _path[0];
 	driveletter.UpperCase();
 	test(driveletter == (TChar)'C');
 	delete notify;
 // We receive no notifications for files changed under the directory
 void NegativeTestDirStar()
 	{
 	RFs fs;
 	TInt r = fs.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	CFsNotify* notify = NULL;
 	TRAP(r,notify= CFsNotify::NewL(fs,KMinNotificationBufferSize));
 	TBuf<40> path;
 	path.Append((TChar)gDriveToTest);
 	path.Append(_L(":\\F32-TST\\T_NOTIFIER\\"));
 	r = fs.MkDirAll(path);
-	test_Value(r, r == KErrNone || r == KErrAlreadyExists);
+	test(r == KErrNone || r == KErrAlreadyExists);
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,path,_L(""));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TBuf<40> filename;
 	filename.Append((TChar)gDriveToTest);
 	filename.Append(_L(":\\F32-TST\\T_NOTIFIER\\dir.star"));
 	RFile file;
 	r = file.Replace(fs,filename,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	file.Close();
 	RTimer timer1;
 	r = timer1.CreateLocal();
-	test_KErrNone(r);
+	test(r == KErrNone);
 	TRequestStatus timeout;
 	TTimeIntervalMicroSeconds32 time = 2000000;    //2 seconds
 	timer1.After(timeout,time);
 	User::WaitForRequest(timeout,status);
 	test(status.Int() == KRequestPending);
 	//1
 	test.Printf(_L("NegativeTests() A\n"));
 	RFs fs;
 	CFsNotify* notify = NULL;
 	TInt r = fs.Connect();
-	test_KErrNone(r);
+	test(r == KErrNone);
 	TRAP(r,notify = CFsNotify::NewL(fs,0));
 	test(notify != NULL);
 	delete notify;
 	notify = NULL;
 	delete notify;
 	notify = NULL;
 	test.Printf(_L("NegativeTests() C\n"));
 	TRAP(r,notify = CFsNotify::NewL(fs,KMaxTInt));
-	test_Value(r, r == KErrArgument);
+	test(r==KErrArgument);
 	test(notify==NULL);
 	//3
 	test.Printf(_L("NegativeTests() D\n"));
 	TBuf<40> path;
 	path.Append((TChar)gDriveToTest);
 	path.Append(_L(":\\F32-TST\\T_NOTIFIER\\"));
 	TBuf<20> filename;
 	filename.Append(_L("file.txt"));
 	TRAP(r,notify = CFsNotify::NewL(fs,KMinNotificationBufferSize));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(notify!=NULL);
 	r = notify->AddNotification(0,path,filename);
-	test_Value(r, r == KErrArgument);
+	test(r == KErrArgument);
 	test.Printf(_L("NegativeTests() E\n"));
 	r = notify->AddNotification((TUint)0x8000,path,filename); //invalid value
-	test_Value(r, r == KErrArgument);
+	test(r == KErrArgument);
 	test.Printf(_L("NegativeTests() F\n"));
 	TBuf<40> invalidPath;
 	invalidPath.Append(_L("1:\\*"));
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,invalidPath,filename);
-	test_Value(r, r == KErrNotFound || r == KErrPathNotFound);
+	test(r == KErrNotFound || r == KErrPathNotFound);
 	//4
 	test.Printf(_L("NegativeTests() G\n"));
 	TRequestStatus wrongStatus;
 	wrongStatus = KRequestPending;
 	r = notify->RequestNotifications(wrongStatus);
-	test_Value(r, r == KErrInUse);
+	test(r == KErrInUse);
 	test.Printf(_L("NegativeTests() H\n"));
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = notify->CancelNotifications(wrongStatus);
-	test_Value(r, r == KErrInUse);
+	test(r == KErrInUse);
 	delete notify;
 	notify = NULL;
 	fs.Close();
 	}
 * the framework doesn't notify about them
 */
 TInt TestNotificationsWithFServPlugins()
 	{
 	TInt r = TheFs.AddPlugin(KNotifyPluginFileName);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	r = TheFs.MountPlugin(KNotifyPluginName,(TUint)gDriveToTest.GetUpperCase() - 65);
 	if (r == KErrNotSupported)
 		{
 		test.Printf(_L("Plugins are not supported on pagable drives.\nSkipping test.\n"));
 		safe_test(test,r,__LINE__,(TText*)Expand("t_notifier.cpp"));
 	test.Next(_L("CFsNotify Creation and Delete Tests"));
 	//Creates and Deletes 1 CFsNotify
 	__UHEAP_MARK;
 	r = TestNewDeleteCFsNotify(1);
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//Creates and Deletes 50 CFsNotifys
 	__UHEAP_MARK;
 	r = TestNewDeleteCFsNotify(50);
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of User Heap Tests ---------------------------------------\n"));
 	//
 	// 2.	Add notification for creating a file
 	//		Create that file
 	//
 	PrintLine();
 	__UHEAP_MARK;
 	r = SimpleCreateTestL();
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of CFsNotify Creation and Delete Tests -------------------\n"));
 	//
 	// 3.	Add notification at the root of a drive
 	//		Create a file in that drive
 	//
 	//
 	PrintLine();
 	__UHEAP_MARK;
 	r = TestTwoDoersL();
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of TwoDoers Test -----------------------------------------\n"));
 	//
 	// 6.	Create 2 file server sessions
 	//		Add a notification on each session for the same specific file creation
 	//		Create that file
 	//
 	PrintLine();
 	__UHEAP_MARK;
 	r = TestTwoWatchersL();
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of TwoWatchers Test --------------------------------------\n"));
 	//
 	// 7.	Create 2 file server sessions and 2 clients
 	//		Add a notification on each session for different file creations
 	//		Clients create a file each
 	//
 	PrintLine();
 	__UHEAP_MARK;
 	r = TestTwoWatchersTwoDoersL();
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of TwoWatchersTwoDoers Test ------------------------------\n"));
 	//
 	// 8.	Add notification for a specific file creation
 	//		Cancel the notification request
 	//		Create that file
 	//
 	PrintLine();
 	__UHEAP_MARK;
 	r =  TestCancelNotificationL();
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of CancelNotification Test -------------------------------\n"));
 	//
 	// 9.	Create 2 file server sessions
 	//		Add a notification on each session for the same specific file creation
 	//		Delete the first notification
 	PrintLine();
 	test.Next(_L("TestClientRemoval"));
 	__UHEAP_MARK;
 	r = TestClientRemovalL();
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of TestClientRemoval Test --------------------------------\n"));
 	//
 	// 10.	Create a CFsNotify object
 	//		Close the session before closing the subsession
 	//		Add notification and request notifications
 	//
 	PrintLine();
 	test.Next(_L("EFileCreate Tests"));
 	_LIT(KFilename3,"file.create");
 	r = TestMultipleNotificationsL(_L(""),KFilename3,5,5,t_notification::EFileCreate,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of EFileCreate Tests -------------------------------------\n"));
 	//
 	// RFs::MkDir
 	// 2.  Add notification for a specific directory creation
 	//     Create that directory
 	//
 	PrintLine();
 	test.Next(_L("EFsMkDir Test"));
 	_LIT(KDirName1,"dirCreate\\");
 	r = TestMultipleNotificationsL(KDirName1,_L(""),1,1,t_notification::EFsMkDir,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of EFsMkDir Test -----------------------------------------\n"));
 	//
 	// RFile::Replace
 	// 3.  Add notification for a specific file creation
 	//     Replace that file
 	//
 	PrintLine();
 	test.Next(_L("EFileReplace Test"));
 	r = TestMultipleNotificationsL(_L(""),KFilename3,1,1,t_notification::EFileReplace,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of EFileReplace Test -------------------------------------\n"));
 	//
 	// 4.  Add notification for a specific file creation
 	//     Remove that notification
 	//     Create that file
 	//
 	PrintLine();
 	__UHEAP_MARK;
 	r =  TestAddRemoveNotificationL();
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of Add and Remove Notification Test ----------------------\n"));
 	//
 	// Wildcard Create Tests
 	// 5.  Add notification for file creation using wildcard name
 	//     Add notification for file/directory wildcard including subdirectories
 	test.Next(_L("Wildcard Create Tests"));
 	//
 	// Wildcard Name
 	_LIT(KWildcardName1,"*");
 	r = TestMultipleNotificationsL(_L(""),KWildcardName1,1,1,t_notification::EFileCreate,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(KWildcardName1,KWildcardName1,1,1,t_notification::EFileCreate_subs,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(KWildcardName1,KWildcardName1,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// Wildcard including Subdirectories
 	_LIT(KWildcardName2,"*\\");
 	r = TestMultipleNotificationsL(KWildcardName2,KWildcardName1,1,1,t_notification::EFileCreate,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(KWildcardName2,KWildcardName1,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	_LIT(KDirName2,"SubDir\\");
 	_LIT(KWildcardName3,"?");
 	r = TestMultipleNotificationsL(KDirName2,KWildcardName3,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// Wildcard Type
 	_LIT(KWildcardName4,"*.*");
 	r = TestMultipleNotificationsL(_L(""),KWildcardName4,1,1,t_notification::EFileCreate_txt_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(_L(""),KWildcardName4,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 6.  Add notification for file creation for a specific type
 	//     Create file with that type
 	//     Create file with different type
 	//
 	_LIT(KWildcardName5,"*.txt");
 	r = TestMultipleNotificationsL(_L(""),KWildcardName5,1,1,t_notification::EFileCreate_txt,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of Wildcard Create Tests ---------------------------------\n"));
 	//=============================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2445
 	//
 	PrintLine();
 	test.Next(_L("Attribute Tests"));
 	_LIT(KFilename4,"file.setatts");
 	r = TestMultipleNotificationsL(_L(""),KFilename4,1,1,t_notification::EFileSetAtt,TFsNotification::EAttribute,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(_L(""),KFilename4,1,1,t_notification::EFileSet,TFsNotification::EAttribute,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(_L(""),KFilename4,1,1,t_notification::EFsSetEntry,TFsNotification::EAttribute,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// Wildcard Attribute Test including subdirectories
 	// 2.  Add notification for file attribute change using wildcard name
 	//     Create number of files that match the notification
 	//     Change attributes of some files
 	//
 	r = TestMultipleNotificationsL(KWildcardName2,_L("*"),3,3,t_notification::EFileSetAtt_subs,TFsNotification::EAttribute,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of Attribute Tests ---------------------------------------\n"));
 	//=============================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2446
 	//
 	PrintLine();
 	test.Next(_L("Rename Tests"));
 	_LIT(KFilename5,"file.rename");
 	r = TestMultipleNotificationsL(_L(""),KFilename5,1,1,t_notification::EFsReplace,TFsNotification::ERename,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(_L(""),KFilename5,1,1,t_notification::EFsRename,TFsNotification::ERename,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(_L(""),KFilename5,1,1,t_notification::EFileRename,TFsNotification::ERename,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 2.  Add notification for a specific directory rename
 	//     Rename that directory
 	//
 	_LIT(KDirName3,"dirRename\\");
 	r = TestMultipleNotificationsL(KDirName3,_L(""),1,1,t_notification::EFsRename_dir,TFsNotification::ERename,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 3.  Add notification for file rename using wildcard name
 	//     Create file that match the notification
 	//     Repeatedly rename the file
 	//
 	r = TestMultipleNotificationsL(_L(""),KWildcardName1,3,3,t_notification::EFileRename_wild,TFsNotification::ERename,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of Rename Tests ------------------------------------------\n"));
 	//=============================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2447
 	//
 	PrintLine();
 	test.Next(_L("EFsDelete Test"));
 	_LIT(KFilename6,"file.delete");
 	r = TestMultipleNotificationsL(_L(""),KFilename6,1,1,t_notification::EFsDelete,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// RFs::RmDir
 	// 2.  Add notification for a specific directory delete
 	//     Delete that directory
 	//
 	PrintLine();
 	test.Next(_L("EFsRmDir Tests"));
 	_LIT(KDirName4,"dirRemove\\");
 	r = TestMultipleNotificationsL(KDirName4,_L(""),1,1,t_notification::EFsRmDir,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 //
 // This test should not receive any notifications because a non-empty directory cannot be removed
 // 3.  Add notification for specific directory delete
 //     Create files inside that directory
 //     Delete the directory
 //
 _LIT(KDirName5,"dirRmNonEmp\\");
 r = TestMultipleNotificationsL(KDirName5,_L(""),1,1,t_notification::EFsRmDir_nonEmpty,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-test_KErrNone(r);
+test(r==KErrNone);
 //
 // Wildcard Name ("*")
 // 4.  Add notification for directory delete using wildcard name
 //     Create directory that match the notification
 	//	   Delete that directory
 //
 r = TestMultipleNotificationsL(KWildcardName1,_L(""),1,1,t_notification::EFsRmDir_wild,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-test_KErrNone(r);
+test(r==KErrNone);
 //
 // Wildcard Type ("*.txt")
 // Creates files with different types and should only receive notifications from "*.txt" file deletions
 // 5.  Add notification for file deletes using wildcard type
 //     Create number of files that match the notification
 //     Delete those files
 //
 r = TestMultipleNotificationsL(_L(""),KWildcardName4,3,3,t_notification::EFsDelete,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-test_KErrNone(r);
+test(r==KErrNone);
 test.Printf(_L("------- End of Delete Tests ------------------------------------------\n"));
 	//======================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2448
 	test.Next(_L("EFileWrite Tests"));
 	_LIT(KFilename7,"file.write");
 	__UHEAP_MARK;
 	r = TestMultipleNotificationsL(_L(""),KFilename7,7,7,t_notification::EFileWrite,TFsNotification::EFileChange,3*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 2.  Add notification for a specific file change
 	//     Write to the specified file a number of times without changing its size
 	//
 	// Four letters are written to a file, then the first letter in the file is replaced aIterations times
 	//     aMaxNotifications = 1 + aIterations
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename7,3,4,t_notification::EFileWrite_samesize,TFsNotification::EFileChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of EFileWrite Tests --------------------------------------\n"));
 	//
 	// 3.  Add notification for a specific file change
 	//     Write to that file asynchronously
 	//
 	test.Next(_L("EFileWrite_async Tests"));
 	_LIT(KFilename8,"async.write");
 	__UHEAP_MARK;
 	r = TestMultipleNotificationsL(_L(""),KFilename8,4,4,t_notification::EFileWrite_async,TFsNotification::EFileChange,2*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
 	__UHEAP_MARKEND;
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of EFileWrite_async Tests --------------------------------\n"));
 	//
 	// File Set Size
 	// 4.  Add notification for a specific file change
 	//     Both increase and decrease the file sizes a number of times
 	//
 	PrintLine();
 	test.Next(_L("EFileSetSize Tests"));
 	_LIT(KFilename9,"file.setsize");
 	r = TestMultipleNotificationsL(_L(""),KFilename9,5,9,t_notification::EFileSetSize,TFsNotification::EFileChange,3*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of EFileSetSize Tests ------------------------------------\n"));
 	//
 PrintLine();
 	test.Next(_L("CFileMan Tests"));
 	_LIT(KFilenameCFMan,"cf1le.man");
 	TUint notificationTypes = (TUint)TFsNotification::ECreate|TFsNotification::EFileChange|TFsNotification::EAttribute|TFsNotification::EDelete|TFsNotification::ERename;
 	r = TestMultipleNotificationsL(_L(""),KFilenameCFMan,1,5,t_notification::ECFileManMove,notificationTypes,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of CFileMan Tests -------------------------------------\n"));
 	//========================================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2449
 	//
 	PrintLine();
 	test.Next(_L("Mount Tests"));
 	TFullName filesystemName;
 	r = TheFs.FileSystemName(filesystemName,globalDriveNum);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r = TestMultipleNotificationsL(filesystemName,1,1,t_notification::EDismount,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// RFs::MountFileSystem
 	// 2.  Add notification for media change
 	//     Mount the file system
 	//
 	r = TestMultipleNotificationsL(filesystemName,1,1,t_notification::EMount,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// Repeatedly mount and dismount the file system
 	// 3.  Add notification for media change
 	//     Repeatedly dismount and mount the file system
 	//
 	// The file system is dismounted and mounted aIterations times
 	//     aMaxNotifications = 2*aIterations
 	//
 	r = TestMultipleNotificationsL(filesystemName,5,10,t_notification::EMountDismount,TFsNotification::EMediaChange,3*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// RFs::MountFileSystemAndScan
 	// 4.  Add notification for media change
 	//     Mount and scan the file system
 	//
 	// The file system is dismounted and mounted aIterations times
 	//     aMaxNotifications = 2*aIterations
 	//
 //#ifndef __WINS__
 //    r = TestMultipleNotificationsL(filesystemName,1,2,t_notification::EMountScan,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-//    test_KErrNone(r);
+//    test(r==KErrNone);
 //#endif
 	test.Printf(_L("------- End of Mount Tests -------------------------------------------\n"));
 	TDriveInfo drvInfo;
 	TInt driveNum;
 	TheFs.CharToDrive(gDriveToTest,driveNum);
 	r = TheFs.Drive(drvInfo,driveNum);
-	test_KErrNone(r);
+	test (r == KErrNone);
 	TPtrC driveDes((TText*)&gDriveToTest,1);
 	//
 	// Manual Tests - Will only run on removable drives
 	//
 /*	if(drvInfo.iDriveAtt & KDriveAttRemovable)
 		//    Remove media card manually
 		//
 		PrintLine();
 		test.Next(_L("Media Card Removal/Insertion Tests"));
 		r = TestMultipleNotificationsL(driveDes,1,1,t_notification::EMediaCardRemoval,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		//
 		// 6. Add notification for media change
 		//    Insert media card manually
 		//
 		r = TestMultipleNotificationsL(driveDes,1,1,t_notification::EMediaCardInsertion,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		test.Printf(_L("------- End of Media Card Removal/Insertion Tests --------------------\n"));
 		//
 		// We should receive an EMediaChange notification even though we did not register for it
 		// 7. Do not add notification for media change
 		//    Remove and insert media card manually
 #endif
 {
 PrintLine();
 test.Next(_L("RRawDisk::Write Tests"));
 r = TestMultipleNotificationsL(driveDes,1,1,t_notification::ERawDiskWrite,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-test_KErrNone(r);
+test(r==KErrNone);
 test.Printf(_L("------- End of RRawDisk::Write Test ------------------------------  \n"));
 }
 	//===============================================================================
 //      Change the drive name
 	//
 	PrintLine();
 	test.Next(_L("DriveName Test"));
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::ESetDriveName,TFsNotification::EDriveName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 2.  Add notification for a specific drive name change
 	//     Repeatedly rename the drive
 	//
 	r = TestMultipleNotificationsL(driveDes,3,6,t_notification::ESetDriveName,TFsNotification::EDriveName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of DriveName Test ----------------------------------------\n"));
 	//================================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2451
 	//
 	// 1.  Add notification for a specific volume name change
 	//     Change the volume name
 	//
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::ESetVolumeLabel,TFsNotification::EVolumeName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 2.  Add notification for a specific volume name change
 	//     Repeatedly rename the volume
 	//
 	r = TestMultipleNotificationsL(driveDes,3,6,t_notification::ESetVolumeLabel,TFsNotification::EVolumeName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of VolumeName Test ---------------------------------------\n"));
 #endif
 //=============================================================================
 	// EAllOps1: A file is created and deleted aIterations times
 	// 		aMaxNotification = 2*aIterations
 	//
 	_LIT(KFilename10,"file.allops");
 	r = TestMultipleNotificationsL(_L(""),KFilename10,4,8,t_notification::EAllOps1,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 2.	Add notification for all operations
 	//		Create a file
 	//		Write to the file
 	//		Delete the file
 	//
 	// EAllOps2: A file is created, written to aIterations times and then deleted
 	// 		aMaxNotification = 2 + aIterations (See File Write Tests)
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename10,4,6,t_notification::EAllOps2,(TUint)TFsNotification::EAllOps,2*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 3.	Add notification for all operations
 	//		Create a file
 	//		Change the file size
 	//		Delete the file
 	// EAllOps3: A file is created, its size is increased size aIterations times, decreased (aIterations - 1) times
 	// 			 and then deleted
 	//     aMaxNotifications = 1 + 2*aIterations
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename10,4,9,t_notification::EAllOps3,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize*2,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 4.	Add notification for all operations
 	//		Create a file
 	//		Change the file attribute
 	//		Delete the file
 	//
 	// EAllOps4: A file is created, its attribute is changed and the file is deleted
 	// 		aMaxNotification = 3
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename10,1,3,t_notification::EAllOps4,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 5.	Add notification for all operations
 	//		Create a file
 	//		Rename the file
 	//
 	// EAllOps5: A file is created and renamed
 	// 		aMaxNotification = 2
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename10,1,2,t_notification::EAllOps5,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// 6.	Add notification for all operations
 	//		Change drive name
 	//		Change volume name
 	//
 	// EAllOps6: The drive and volume names are changed
 	//		aMaxNotification = 2
 	//
 #ifndef __WINS__
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::EAllOps6,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 #endif
 	test.Printf(_L("------- End of AllOps Tests ------------------------------------------\n"));
 //=============================================================================
 	// A file is created and deleted aIterations times
 	// 		aMaxNotification = 2*aIterations
 	//
 	_LIT(KFilename11,"file.mulfil");
 	r = TestMultipleNotificationsL(_L(""),KFilename11,3,6,t_notification::EAllOps1,TFsNotification::ECreate | TFsNotification::EDelete,2*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// TFsNotification::EDelete | TFsNotification::ECreate | TFsNotification::EFileChange
 	// 2.	Add notification for create, file change and delete for a specific file
 	//		Create a file
 	//		Change the file size
 	// A file is created, its size is increased size aIterations times, decreased (aIterations - 1) times
 	// and then deleted
 	//     aMaxNotifications = 1 + 2*aIterations
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename11,4,9,t_notification::EAllOps3,TFsNotification::EDelete | TFsNotification::ECreate | TFsNotification::EFileChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// TFsNotification::EAttribute | TFsNotification::EDelete | TFsNotification::ECreate
 	// 3.	Add notification for create, attribute change and delete for a specific file
 	//		Create a file
 	//		Change the file attribute
 	//
 	// A file is created, its attribute is changed and the file is deleted
 	// 		aMaxNotification = 3
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename11,1,3,t_notification::EAllOps4,TFsNotification::EAttribute | TFsNotification::EDelete | TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// TFsNotification::ERename | TFsNotification::ECreate
 	// 4.	Add notification for create and rename for a specific file
 	//		Create a file
 	//		Rename the file
 	//
 	// A file is created and renamed
 	// 		aMaxNotification = 2
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename11,1,2,t_notification::EAllOps5,TFsNotification::ERename | TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//
 	// TFsNotification::EVolumeName | TFsNotification::EDriveName
 	// 5.	Add notification for drive and volume name change for a specific drive
 	//		Change drive name
 	//		Change volume name
 	// The drive and volume names are changed
 	//		aMaxNotification = 2
 	//
 #ifndef __WINS__
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::EAllOps6,TFsNotification::EVolumeName | TFsNotification::EDriveName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test_KErrNone(r);
+	test(r==KErrNone);
 #endif
 	test.Printf(_L("------- End of Multiple-Filter Tests ---------------------------------\n"));
 	//==============================================================================
 	// 2.	Make continuous file size changes to the file
 	// 3.	When overflow notification occurs, delete the notification
 	//
 	PrintLine();
 	r = TestOverflowL();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	//For DEF140387
 	PrintLine();
 	r= TestPostOverflowNotifications();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of Overflow Test -----------------------------------------\n"));
 	//============================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2455
 //! @SYMTestCaseDesc        Plugin Tests
 //! @SYMTestStatus
 	//=============================================================================
 	PrintLine();
 	r = TestNotificationsWithFServPlugins();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Printf(_L("------- End of Plugin Tests ------------------------------------------\n"));
 	//======================================================================
 	//! @SYMTestCaseID			PBASE-T_NOTIFY-2459
 #endif
 		{
 		PrintLine();
 		test.Next(_L("Format Tests"));
 		r = TestMultipleNotificationsL(driveDes,1,1,t_notification::EFormat,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		test.Printf(_L("------- End of Format Tests ------------------------------------------\n"));
 		}
 	//======================================================================
 	//	3.	A process with the specified uid
 	//
 	PrintLine();
 	test.Next(_L("Test T_NOTIFIER_NOCAPS.EXE"));
 	r = TestProcessCapabilities(_L("T_NOTIFIER_NOCAPS.EXE"));
-	test_Value(r, r == KErrPermissionDenied); //Failure on emulator -> Did you forget to do a wintest?
+	test(r == KErrPermissionDenied); //Failure on emulator -> Did you forget to do a wintest?
 	test.Next(_L("Test T_NOTIFIER_ALLFILES.EXE"));
 	r = TestProcessCapabilities(_L("T_NOTIFIER_ALLFILES.EXE"));
-	test_KErrNone(r);
+	test(r == KErrNone);
 	test.Next(_L("Test T_NOTIFIER_BELONGS.EXE"));
 	r = TestProcessCapabilities(_L("T_NOTIFIER_BELONGS.EXE"));
-	test_KErrNone(r);
+	test(r == KErrNone);
 	test.Printf(_L("------- End of Data-Caging Tests -------------------------------------\n"));
 	test.End();
 	test.Close();

branch	RCL_3
changeset 257	3e88ff8f41d5
parent 256	c1f20ce4abcf