kerneltest/f32test/server/t_notifier.cpp
changeset 189 a5496987b1da
parent 31 56f325a607ea
child 257 3e88ff8f41d5
child 299 b5a01337d018
--- a/kerneltest/f32test/server/t_notifier.cpp	Wed Jun 23 12:58:21 2010 +0100
+++ b/kerneltest/f32test/server/t_notifier.cpp	Thu Jul 01 17:57:33 2010 +0100
@@ -15,6 +15,7 @@
 // 
 //
 
+#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include <e32svr.h>
@@ -164,7 +165,7 @@
 	{
 	RFs fs;
 	TInt r = fs.Connect();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	CFsNotify* notify = NULL;
 	TRAP(r,notify= CFsNotify::NewL(fs,KMinNotificationBufferSize));
@@ -177,11 +178,11 @@
 	filename.Append(_L("media.change1"));
 	
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	test.Printf(_L("*****************************************************************\n"));
 	test.Printf(_L("Waiting 10 seconds.\n"));
@@ -191,7 +192,7 @@
 	test.Printf(_L("*****************************************************************\n"));
 	RTimer timer1;
 	r = timer1.CreateLocal();
-	test(r == KErrNone);
+	test_KErrNone(r);
 	TRequestStatus timeout;
 	TTimeIntervalMicroSeconds32 time = 10000000;
 	timer1.After(timeout,time);
@@ -209,9 +210,9 @@
 	drive.Append(_L(":"));
 	TPtrC drivePtr;
 	r = notification->Path(drivePtr);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = drivePtr.Compare(drive);
-	test(r==0);
+	test_Value(r, r == 0);
 	
 	test.Printf(_L("*****************************************************************\n"));
 	test.Printf(_L("Waiting 10 seconds.\n"));
@@ -226,7 +227,7 @@
 		notify->RequestNotifications(status);
 		RTimer timer2;
 		r = timer2.CreateLocal();
-		test(r == KErrNone);
+		test_KErrNone(r);
 		TRequestStatus timeout2;
 		timer2.After(timeout2,time);
 		User::WaitForRequest(timeout2,status);
@@ -249,7 +250,7 @@
 	{
 	RFs fs;
 	TInt r = fs.Connect();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	CFsNotify* notify1 = NULL;
 	CFsNotify* notify2 = NULL;
@@ -260,7 +261,7 @@
 		{
 		delete notify1;
 		delete notify2;
-		test(r==KErrNone);
+		test_KErrNone(r);
 		}
 	
 	TBuf<40> path;
@@ -275,15 +276,15 @@
 	fullname.Append(filename);
 	
 	r = notify1->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = notify2->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	delete notify1; //Delete notify1 and ensure we still get notification on notify2
 	
 	TRequestStatus status;
 	r = notify2->RequestNotifications(status);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	RFile file;
 	file.Replace(fs,fullname,EFileWrite); //Replace produces Create notification
@@ -291,7 +292,7 @@
 	
 	RTimer tim;
 	r = tim.CreateLocal();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TRequestStatus timStatus;
 	TTimeIntervalMicroSeconds32 time = 10000000; //10 seconds
@@ -301,7 +302,7 @@
 	test(status!=KRequestPending);
 	
 	r = fs.Delete(fullname);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	delete notify2;
 	tim.Close();
@@ -324,7 +325,7 @@
 	CFsNotify* notify = NULL;
 	
 	TRAPD(r,notify = CFsNotify::NewL(fs,KMinNotificationBufferSize););
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test(notify!=NULL);
 	
 	TBuf<40> path;
@@ -335,18 +336,18 @@
 	filename.Append(_L("*"));
 	
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	RFile file;
 	TBuf<40> filePath;
 	filePath.Append((TChar)gDriveToTest);
 	filePath.Append(_L(":\\file.root"));
 	r = file.Replace(fs,filePath,EFileRead);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 	
 	TRequestStatus s2;
@@ -1326,7 +1327,7 @@
 		    
 		    CFileMan* cfman = NULL;
 		    TRAP(r, cfman = CFileMan::NewL(fs);)
-		    test(r == KErrNone);
+		    test_KErrNone(r);
             test(cfman != NULL);
             TBuf<40> unmonitored_path;
             unmonitored_path.Append(gDriveToTest);
@@ -1396,13 +1397,13 @@
 	TUidType uid;
 	TPtrC command((TText*)&gDriveToTest,1);
 	TInt r = process.Create(aProcessName,command,uid);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	process.Resume();
 	TRequestStatus s1;
 	TRequestStatus s2;
 	RTimer tim;
 	r = tim.CreateLocal();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	TTimeIntervalMicroSeconds32 delay = 5000000; //5 seconds
 	tim.After(s1,delay);
 	process.Logon(s2);
@@ -1958,9 +1959,9 @@
 	RThread doer;
 	
 	TInt r = watcher.Create(_L("TestTwoNotificationsWatcherThread"),MultipleNotificationsTFWatcher,KDefaultStackSize,KMinHeapSize,KMaxHeapSize,&package);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = doer.Create(_L("TestTwoNotificationsDoerThread"),TwoNotificationsTFDoer,KDefaultStackSize,KMinHeapSize,KMaxHeapSize,&package);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Next(_L("TestTwoNotifications - Resume Watcher"));
 	watcher.Resume();
 	test.Next(_L("TestTwoNotifications - Wait for Watcher to be ready"));
@@ -2622,9 +2623,9 @@
 	RThread doer;
 
 	TInt r = watcher.Create(_L("TestCancelNotification-WatcherThread"),TestCancelNotificationWatcher,KDefaultStackSize*2,KMinHeapSize,KMaxHeapSize,&package);
-	test(r == KErrNone);
+	test_KErrNone(r);
 	r = doer.Create(_L("TestCancelNotification-DoerThread"),SimpleSingleNotificationTFDoer,KDefaultStackSize*2,KMinHeapSize,KMaxHeapSize,&package);
-	test(r == KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("TestCancelNotificationL - Watcher.Resume()"));
 	watcher.Resume();
 	test.Printf(_L("TestCancelNotificationL - Waiting on package.iBarrier.Wait()"));
@@ -2645,7 +2646,7 @@
 	
 	RTimer tim;
 	r = tim.CreateLocal();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TRequestStatus timStatus;
 	TTimeIntervalMicroSeconds32 time = 10000000; //10 seconds
@@ -2729,7 +2730,7 @@
 			
 			RDebug::Printf("TestSessionCloseTF - Case 2 - Add Notification\n");
 			r = notify->AddNotification((TUint)TFsNotification::ECreate,path,filename);
-			test(r==KErrNone);
+			test_KErrNone(r);
 			
 			RDebug::Printf("TestSessionCloseTF - Case 2 - Fs.Close\n");
 			fs.Close();
@@ -2779,7 +2780,7 @@
 	User::WaitForRequest(status);
 	test.Printf(_L("Kern-Exec 0 is EXPECTED\n"));
 	TInt err = thread.ExitReason();
-	test(err == KErrNone);
+	test_KErrNone(err);
 	TExitType et = thread.ExitType();
 	test(et == EExitPanic);
 	CLOSE_AND_WAIT(thread);
@@ -2859,7 +2860,7 @@
 	//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(r == KErrNone);
+	test_KErrNone(r);
 	User::LeaveIfNull(notify);
 	notify->AddNotification(TFsNotification::EFileChange,path,filename);
 	notify->RequestNotifications(status);
@@ -2941,7 +2942,7 @@
 	test.Next(_L("TestOverflow"));
 	RFs fs;
 	TInt r = fs.Connect();
-	test(r == KErrNone);
+	test_KErrNone(r);
 	_LIT(KFileName,"over.flow");
 	SThreadPackage doerPkg;
 	doerPkg.iFileName = KFileName;
@@ -2983,7 +2984,7 @@
 	
 	RTimer tim;
 	r = tim.CreateLocal();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	TRequestStatus timStatus;
 	
 	test.Next(_L("TestOverflow - Wait for watcher1 thread death"));
@@ -3060,7 +3061,7 @@
     {
     TRequestStatus status;
     TInt r = aNotify->RequestNotifications(status);
-    test(r == KErrNone);
+    test_KErrNone(r);
     //Signal that overflow has been found (W4)
     aPackage.iBarrier.Signal();
     
@@ -3086,7 +3087,7 @@
         if(notification == NULL)
             {
             r = aNotify->RequestNotifications(status);
-            test(r == KErrNone);
+            test_KErrNone(r);
             User::WaitForRequest(status);
             notification = aNotify->NextNotification();
             }
@@ -3127,7 +3128,7 @@
     //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(r == KErrNone);
+    test_KErrNone(r);
     User::LeaveIfNull(notify);
     notify->AddNotification(TFsNotification::EFileChange,path,filename);
     notify->RequestNotifications(status);
@@ -3196,7 +3197,7 @@
     test.Next(_L("TestPostOverflowNotifications"));
     RFs fs;
     TInt r = fs.Connect();
-    test(r == KErrNone);
+    test_KErrNone(r);
     _LIT(KFileName,"post.over");
     SThreadPackage doerPkg;
     doerPkg.iFileName = KFileName;
@@ -3251,21 +3252,21 @@
     path.Append(watcher1Pkg.iFileName);
     RFile file;
     r = file.Open(fs,path,EFileWrite);
-    test(r==KErrNone);
+    test_KErrNone(r);
     
     r = file.SetSize(1);
-    test(r==KErrNone);
+    test_KErrNone(r);
     r = file.SetSize(2);
-    test(r==KErrNone);
+    test_KErrNone(r);
     r = file.SetSize(3);
-    test(r==KErrNone);
+    test_KErrNone(r);
     file.Close();
     
     watcher1Pkg.iBarrier.Signal(); // Signal post operations complete (Sx)
     
     RTimer tim;
     r = tim.CreateLocal();
-    test(r==KErrNone);
+    test_KErrNone(r);
     TRequestStatus timStatus;
     
     test.Next(_L("TestOverflow - Wait for watcher1 thread death"));
@@ -3307,11 +3308,11 @@
 	test.Next(_L("TestNonDriveFilters"));
 	RFs fs;
 	TInt r = fs.Connect();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TDriveList drives;
 	r = fs.DriveList(drives);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	CFsNotify* notify = NULL;
 	TRAP(r,notify= CFsNotify::NewL(fs,KMinNotificationBufferSize));
@@ -3320,11 +3321,11 @@
 	testfile.Append(_L("test.file"));
 	
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,_L(""),testfile);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TBuf<40> path;
 	path.Append((TChar)gDriveToTest);
@@ -3336,9 +3337,9 @@
 	
 	RFile file;
 	r = fs.MkDirAll(path);
-	test(r==KErrNone || r==KErrAlreadyExists);
+	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
 	r = file.Replace(fs,fullname,EFileWrite);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 	
 	fs.Delete(fullname);
@@ -3362,14 +3363,14 @@
 		}
 	
 	r = fs.MkDirAll(fullname);
-	test(r==KErrNone || r==KErrAlreadyExists);
+	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
 	r = file.Replace(fs,fullname,EFileWrite);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 	
 	RTimer timer1;
 	r = timer1.CreateLocal();
-	test(r == KErrNone);
+	test_KErrNone(r);
 	TRequestStatus timeout;
 	TTimeIntervalMicroSeconds32 time = 10000000;    //10 seconds
 	timer1.After(timeout,time);
@@ -3382,7 +3383,7 @@
 	test(notification != NULL);
 	TPtrC _path;
 	r = notification->Path(_path);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	TChar driveletter = _path[0];
 	driveletter.UpperCase();
 	test(driveletter ==  (TChar)gDriveToTest);
@@ -3391,11 +3392,11 @@
 		{
 		TRequestStatus status2;
 		r = notify->RequestNotifications(status2);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		
 		RTimer timer2;
 		r = timer2.CreateLocal();
-		test(r == KErrNone);
+		test_KErrNone(r);
 		TRequestStatus timeout2;
 		TTimeIntervalMicroSeconds32 time2 = 10000000;    //10 seconds
 		timer2.After(timeout2,time2);
@@ -3408,7 +3409,7 @@
 		}
 	test(notification != NULL);
 	r = notification->Path(_path);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	driveletter = _path[0];
 	driveletter.UpperCase();
 	test(driveletter == (TChar)'C');	
@@ -3423,7 +3424,7 @@
 	{
 	RFs fs;
 	TInt r = fs.Connect();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	CFsNotify* notify = NULL;
 	TRAP(r,notify= CFsNotify::NewL(fs,KMinNotificationBufferSize));
@@ -3432,14 +3433,14 @@
 	path.Append((TChar)gDriveToTest);
 	path.Append(_L(":\\F32-TST\\T_NOTIFIER\\"));
 	r = fs.MkDirAll(path);
-	test(r == KErrNone || r == KErrAlreadyExists);
+	test_Value(r, r == KErrNone || r == KErrAlreadyExists);
 	
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,path,_L(""));
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	TBuf<40> filename;
 	filename.Append((TChar)gDriveToTest);
@@ -3447,12 +3448,12 @@
 	
 	RFile file;
 	r = file.Replace(fs,filename,EFileWrite);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 	
 	RTimer timer1;
 	r = timer1.CreateLocal();
-	test(r == KErrNone);
+	test_KErrNone(r);
 	TRequestStatus timeout;
 	TTimeIntervalMicroSeconds32 time = 2000000;    //2 seconds
 	timer1.After(timeout,time);
@@ -3479,7 +3480,7 @@
 	RFs fs;
 	CFsNotify* notify = NULL;
 	TInt r = fs.Connect();
-	test(r == KErrNone);
+	test_KErrNone(r);
 	TRAP(r,notify = CFsNotify::NewL(fs,0));
 	test(notify != NULL);
 	delete notify;
@@ -3494,7 +3495,7 @@
 
 	test.Printf(_L("NegativeTests() C\n"));
 	TRAP(r,notify = CFsNotify::NewL(fs,KMaxTInt));
-	test(r==KErrArgument);
+	test_Value(r, r == KErrArgument);
 	test(notify==NULL);
 	
 	//3
@@ -3505,34 +3506,34 @@
 	TBuf<20> filename;
 	filename.Append(_L("file.txt"));
 	TRAP(r,notify = CFsNotify::NewL(fs,KMinNotificationBufferSize));
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test(notify!=NULL);
 	r = notify->AddNotification(0,path,filename);
-	test(r == KErrArgument);
+	test_Value(r, r == KErrArgument);
 	
 	test.Printf(_L("NegativeTests() E\n"));
 	r = notify->AddNotification((TUint)0x8000,path,filename); //invalid value
-	test(r == KErrArgument);
+	test_Value(r, r == KErrArgument);
 	
 	test.Printf(_L("NegativeTests() F\n"));
 	TBuf<40> invalidPath;
 	invalidPath.Append(_L("1:\\*"));
 	r = notify->AddNotification((TUint)TFsNotification::ECreate,invalidPath,filename);
-	test(r == KErrNotFound || r == KErrPathNotFound);
+	test_Value(r, r == KErrNotFound || r == KErrPathNotFound);
 	
 	//4
 	test.Printf(_L("NegativeTests() G\n"));
 	TRequestStatus wrongStatus;
 	wrongStatus = KRequestPending;
 	r = notify->RequestNotifications(wrongStatus);
-	test(r == KErrInUse);
+	test_Value(r, r == KErrInUse);
 	
 	test.Printf(_L("NegativeTests() H\n"));
 	TRequestStatus status;
 	r = notify->RequestNotifications(status);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = notify->CancelNotifications(wrongStatus);
-	test(r == KErrInUse);
+	test_Value(r, r == KErrInUse);
 	
 	delete notify;
 	notify = NULL;
@@ -3593,7 +3594,7 @@
 TInt TestNotificationsWithFServPlugins()
 	{
 	TInt r = TheFs.AddPlugin(KNotifyPluginFileName);
-	test(r==KErrNone || r==KErrAlreadyExists);
+	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
 	r = TheFs.MountPlugin(KNotifyPluginName,(TUint)gDriveToTest.GetUpperCase() - 65);
 	if (r == KErrNotSupported)
 		{
@@ -3653,12 +3654,12 @@
 	__UHEAP_MARK;
 	r = TestNewDeleteCFsNotify(1);
 	__UHEAP_MARKEND;
-	test(r==KErrNone);	
+	test_KErrNone(r);	
 	//Creates and Deletes 50 CFsNotifys
 	__UHEAP_MARK;
 	r = TestNewDeleteCFsNotify(50);
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of User Heap Tests ---------------------------------------\n"));
 	//
 	// 2.	Add notification for creating a file
@@ -3668,7 +3669,7 @@
 	__UHEAP_MARK;
 	r = SimpleCreateTestL();
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of CFsNotify Creation and Delete Tests -------------------\n"));
 	//
 	// 3.	Add notification at the root of a drive
@@ -3694,7 +3695,7 @@
 	__UHEAP_MARK;
 	r = TestTwoDoersL();
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of TwoDoers Test -----------------------------------------\n"));
 	//
 	// 6.	Create 2 file server sessions
@@ -3705,7 +3706,7 @@
 	__UHEAP_MARK;
 	r = TestTwoWatchersL();
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of TwoWatchers Test --------------------------------------\n"));
 	//
 	// 7.	Create 2 file server sessions and 2 clients
@@ -3716,7 +3717,7 @@
 	__UHEAP_MARK;
 	r = TestTwoWatchersTwoDoersL();
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of TwoWatchersTwoDoers Test ------------------------------\n"));
 	//
 	// 8.	Add notification for a specific file creation
@@ -3727,7 +3728,7 @@
 	__UHEAP_MARK;
 	r =  TestCancelNotificationL();
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of CancelNotification Test -------------------------------\n"));
 	//
 	// 9.	Create 2 file server sessions
@@ -3740,7 +3741,7 @@
 	__UHEAP_MARK;
 	r = TestClientRemovalL();
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of TestClientRemoval Test --------------------------------\n"));
 	//
 	// 10.	Create a CFsNotify object
@@ -3777,7 +3778,7 @@
 	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(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of EFileCreate Tests -------------------------------------\n"));
 	//
 	// RFs::MkDir
@@ -3788,7 +3789,7 @@
 	test.Next(_L("EFsMkDir Test"));
 	_LIT(KDirName1,"dirCreate\\");
 	r = TestMultipleNotificationsL(KDirName1,_L(""),1,1,t_notification::EFsMkDir,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of EFsMkDir Test -----------------------------------------\n"));
 	//
 	// RFile::Replace
@@ -3798,7 +3799,7 @@
 	PrintLine();
 	test.Next(_L("EFileReplace Test"));
 	r = TestMultipleNotificationsL(_L(""),KFilename3,1,1,t_notification::EFileReplace,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of EFileReplace Test -------------------------------------\n"));
 	//
 	// 4.  Add notification for a specific file creation
@@ -3809,7 +3810,7 @@
 	__UHEAP_MARK;
 	r =  TestAddRemoveNotificationL();
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of Add and Remove Notification Test ----------------------\n"));
 	//
 	// Wildcard Create Tests
@@ -3823,29 +3824,29 @@
 	// Wildcard Name
 	_LIT(KWildcardName1,"*");
 	r = TestMultipleNotificationsL(_L(""),KWildcardName1,1,1,t_notification::EFileCreate,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(KWildcardName1,KWildcardName1,1,1,t_notification::EFileCreate_subs,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(KWildcardName1,KWildcardName1,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// Wildcard including Subdirectories
 	_LIT(KWildcardName2,"*\\");
 	r = TestMultipleNotificationsL(KWildcardName2,KWildcardName1,1,1,t_notification::EFileCreate,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(KWildcardName2,KWildcardName1,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	_LIT(KDirName2,"SubDir\\");
 	_LIT(KWildcardName3,"?");
 	r = TestMultipleNotificationsL(KDirName2,KWildcardName3,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// Wildcard Type
 	_LIT(KWildcardName4,"*.*");
 	r = TestMultipleNotificationsL(_L(""),KWildcardName4,1,1,t_notification::EFileCreate_txt_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(_L(""),KWildcardName4,1,1,t_notification::EFileCreate_subs_nowatch,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 6.  Add notification for file creation for a specific type
 	//     Create file with that type
@@ -3853,7 +3854,7 @@
 	//
 	_LIT(KWildcardName5,"*.txt");
 	r = TestMultipleNotificationsL(_L(""),KWildcardName5,1,1,t_notification::EFileCreate_txt,TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of Wildcard Create Tests ---------------------------------\n"));
 	
 	
@@ -3875,11 +3876,11 @@
 	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(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(_L(""),KFilename4,1,1,t_notification::EFileSet,TFsNotification::EAttribute,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(_L(""),KFilename4,1,1,t_notification::EFsSetEntry,TFsNotification::EAttribute,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// Wildcard Attribute Test including subdirectories
 	// 2.  Add notification for file attribute change using wildcard name
@@ -3887,7 +3888,7 @@
 	//     Change attributes of some files
 	//
 	r = TestMultipleNotificationsL(KWildcardName2,_L("*"),3,3,t_notification::EFileSetAtt_subs,TFsNotification::EAttribute,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of Attribute Tests ---------------------------------------\n"));
 	
 	
@@ -3909,25 +3910,25 @@
 	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(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(_L(""),KFilename5,1,1,t_notification::EFsRename,TFsNotification::ERename,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(_L(""),KFilename5,1,1,t_notification::EFileRename,TFsNotification::ERename,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 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(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 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(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of Rename Tests ------------------------------------------\n"));
 	
 	
@@ -3949,7 +3950,7 @@
 	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(r==KErrNone);	
+	test_KErrNone(r);	
 	//
 	// RFs::RmDir
 	// 2.  Add notification for a specific directory delete
@@ -3959,7 +3960,7 @@
 	test.Next(_L("EFsRmDir Tests"));
 	_LIT(KDirName4,"dirRemove\\");
 	r = TestMultipleNotificationsL(KDirName4,_L(""),1,1,t_notification::EFsRmDir,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
     //
     // This test should not receive any notifications because a non-empty directory cannot be removed
     // 3.  Add notification for specific directory delete
@@ -3968,7 +3969,7 @@
     //
     _LIT(KDirName5,"dirRmNonEmp\\");
     r = TestMultipleNotificationsL(KDirName5,_L(""),1,1,t_notification::EFsRmDir_nonEmpty,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)ETrue,__LINE__);
-    test(r==KErrNone);	
+    test_KErrNone(r);	
     //
     // Wildcard Name ("*")
     // 4.  Add notification for directory delete using wildcard name
@@ -3976,7 +3977,7 @@
 	//	   Delete that directory
     //
     r = TestMultipleNotificationsL(KWildcardName1,_L(""),1,1,t_notification::EFsRmDir_wild,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-    test(r==KErrNone);	
+    test_KErrNone(r);	
     //
     // Wildcard Type ("*.txt")
     // Creates files with different types and should only receive notifications from "*.txt" file deletions
@@ -3985,7 +3986,7 @@
     //     Delete those files
     //
     r = TestMultipleNotificationsL(_L(""),KWildcardName4,3,3,t_notification::EFsDelete,TFsNotification::EDelete,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-    test(r==KErrNone);
+    test_KErrNone(r);
     test.Printf(_L("------- End of Delete Tests ------------------------------------------\n"));
 	
 	
@@ -4013,7 +4014,7 @@
 	__UHEAP_MARK;
 	r = TestMultipleNotificationsL(_L(""),KFilename7,7,7,t_notification::EFileWrite,TFsNotification::EFileChange,3*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 2.  Add notification for a specific file change
 	//     Write to the specified file a number of times without changing its size
@@ -4022,7 +4023,7 @@
 	//     aMaxNotifications = 1 + aIterations
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename7,3,4,t_notification::EFileWrite_samesize,TFsNotification::EFileChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of EFileWrite Tests --------------------------------------\n"));
 	//
 	// 3.  Add notification for a specific file change
@@ -4034,7 +4035,7 @@
 	__UHEAP_MARK;
 	r = TestMultipleNotificationsL(_L(""),KFilename8,4,4,t_notification::EFileWrite_async,TFsNotification::EFileChange,2*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
 	__UHEAP_MARKEND;
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of EFileWrite_async Tests --------------------------------\n"));	
 	//
 	// File Set Size
@@ -4048,7 +4049,7 @@
 	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(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of EFileSetSize Tests ------------------------------------\n"));
 
 
@@ -4058,7 +4059,7 @@
 	_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(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of CFileMan Tests -------------------------------------\n"));
 	
 	
@@ -4081,16 +4082,16 @@
 	test.Next(_L("Mount Tests"));
 	TFullName filesystemName;
 	r = TheFs.FileSystemName(filesystemName,globalDriveNum);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = TestMultipleNotificationsL(filesystemName,1,1,t_notification::EDismount,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 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(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// Repeatedly mount and dismount the file system
 	// 3.  Add notification for media change
@@ -4100,7 +4101,7 @@
 	//     aMaxNotifications = 2*aIterations
 	//
 	r = TestMultipleNotificationsL(filesystemName,5,10,t_notification::EMountDismount,TFsNotification::EMediaChange,3*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// RFs::MountFileSystemAndScan
 	// 4.  Add notification for media change
@@ -4111,14 +4112,14 @@
 	//
 //#ifndef __WINS__
 //    r = TestMultipleNotificationsL(filesystemName,1,2,t_notification::EMountScan,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-//    test(r==KErrNone);
+//    test_KErrNone(r);
 //#endif
 	test.Printf(_L("------- End of Mount Tests -------------------------------------------\n"));
 	TDriveInfo drvInfo;
 	TInt driveNum;
 	TheFs.CharToDrive(gDriveToTest,driveNum);
 	r = TheFs.Drive(drvInfo,driveNum);
-	test (r == KErrNone);
+	test_KErrNone(r);
 	TPtrC driveDes((TText*)&gDriveToTest,1);
 	//
 	// Manual Tests - Will only run on removable drives
@@ -4132,13 +4133,13 @@
 		PrintLine();
 		test.Next(_L("Media Card Removal/Insertion Tests"));
 		r = TestMultipleNotificationsL(driveDes,1,1,t_notification::EMediaCardRemoval,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		//
 		// 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(r==KErrNone);
+		test_KErrNone(r);
 		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
@@ -4161,7 +4162,7 @@
         PrintLine();
         test.Next(_L("RRawDisk::Write Tests"));
         r = TestMultipleNotificationsL(driveDes,1,1,t_notification::ERawDiskWrite,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-        test(r==KErrNone);
+        test_KErrNone(r);
         test.Printf(_L("------- End of RRawDisk::Write Test ------------------------------  \n"));
         }	
 	
@@ -4186,13 +4187,13 @@
 	PrintLine();
 	test.Next(_L("DriveName Test"));
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::ESetDriveName,TFsNotification::EDriveName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 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(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of DriveName Test ----------------------------------------\n"));
 	
 	
@@ -4218,13 +4219,13 @@
 	//     Change the volume name
 	//
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::ESetVolumeLabel,TFsNotification::EVolumeName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 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(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of VolumeName Test ---------------------------------------\n"));
 #endif
 		
@@ -4250,7 +4251,7 @@
 	//
 	_LIT(KFilename10,"file.allops");
 	r = TestMultipleNotificationsL(_L(""),KFilename10,4,8,t_notification::EAllOps1,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 2.	Add notification for all operations
 	//		Create a file
@@ -4261,7 +4262,7 @@
 	// 		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(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 3.	Add notification for all operations
 	//		Create a file
@@ -4273,7 +4274,7 @@
 	//     aMaxNotifications = 1 + 2*aIterations
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename10,4,9,t_notification::EAllOps3,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize*2,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 4.	Add notification for all operations
 	//		Create a file
@@ -4284,7 +4285,7 @@
 	// 		aMaxNotification = 3
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename10,1,3,t_notification::EAllOps4,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 5.	Add notification for all operations
 	//		Create a file
@@ -4294,7 +4295,7 @@
 	// 		aMaxNotification = 2
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename10,1,2,t_notification::EAllOps5,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// 6.	Add notification for all operations
 	//		Change drive name
@@ -4306,7 +4307,7 @@
 	//
 #ifndef __WINS__
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::EAllOps6,(TUint)TFsNotification::EAllOps,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 #endif
 	test.Printf(_L("------- End of AllOps Tests ------------------------------------------\n"));
 	
@@ -4331,7 +4332,7 @@
 	//
 	_LIT(KFilename11,"file.mulfil");
 	r = TestMultipleNotificationsL(_L(""),KFilename11,3,6,t_notification::EAllOps1,TFsNotification::ECreate | TFsNotification::EDelete,2*KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// TFsNotification::EDelete | TFsNotification::ECreate | TFsNotification::EFileChange
 	// 2.	Add notification for create, file change and delete for a specific file
@@ -4344,7 +4345,7 @@
 	//     aMaxNotifications = 1 + 2*aIterations
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename11,4,9,t_notification::EAllOps3,TFsNotification::EDelete | TFsNotification::ECreate | TFsNotification::EFileChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// TFsNotification::EAttribute | TFsNotification::EDelete | TFsNotification::ECreate
 	// 3.	Add notification for create, attribute change and delete for a specific file
@@ -4356,7 +4357,7 @@
 	// 		aMaxNotification = 3
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename11,1,3,t_notification::EAllOps4,TFsNotification::EAttribute | TFsNotification::EDelete | TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// TFsNotification::ERename | TFsNotification::ECreate
 	// 4.	Add notification for create and rename for a specific file
@@ -4367,7 +4368,7 @@
 	// 		aMaxNotification = 2
 	//
 	r = TestMultipleNotificationsL(_L(""),KFilename11,1,2,t_notification::EAllOps5,TFsNotification::ERename | TFsNotification::ECreate,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	//
 	// TFsNotification::EVolumeName | TFsNotification::EDriveName
 	// 5.	Add notification for drive and volume name change for a specific drive
@@ -4380,7 +4381,7 @@
 	//
 #ifndef __WINS__
 	r = TestMultipleNotificationsL(driveDes,1,2,t_notification::EAllOps6,TFsNotification::EVolumeName | TFsNotification::EDriveName,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-	test(r==KErrNone);
+	test_KErrNone(r);
 #endif
 	test.Printf(_L("------- End of Multiple-Filter Tests ---------------------------------\n"));
 	
@@ -4400,12 +4401,12 @@
 	//
 	PrintLine();
 	r = TestOverflowL();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
 	//For DEF140387
 	PrintLine();
 	r= TestPostOverflowNotifications();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of Overflow Test -----------------------------------------\n"));
 	
 	
@@ -4454,7 +4455,7 @@
 	//=============================================================================
 	PrintLine();
 	r = TestNotificationsWithFServPlugins();
-	test(r==KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of Plugin Tests ------------------------------------------\n"));
 		
 	
@@ -4481,7 +4482,7 @@
 		PrintLine();
 		test.Next(_L("Format Tests"));
 		r = TestMultipleNotificationsL(driveDes,1,1,t_notification::EFormat,TFsNotification::EMediaChange,KMinNotificationBufferSize,(TBool)EFalse,__LINE__);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		test.Printf(_L("------- End of Format Tests ------------------------------------------\n"));
 		}
 	
@@ -4503,15 +4504,15 @@
 	PrintLine();
 	test.Next(_L("Test T_NOTIFIER_NOCAPS.EXE"));
 	r = TestProcessCapabilities(_L("T_NOTIFIER_NOCAPS.EXE"));
-	test(r == KErrPermissionDenied); //Failure on emulator -> Did you forget to do a wintest?
+	test_Value(r, 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(r == KErrNone);
+	test_KErrNone(r);
 	
 	test.Next(_L("Test T_NOTIFIER_BELONGS.EXE"));
 	r = TestProcessCapabilities(_L("T_NOTIFIER_BELONGS.EXE"));
-	test(r == KErrNone);
+	test_KErrNone(r);
 	test.Printf(_L("------- End of Data-Caging Tests -------------------------------------\n"));