--- a/kerneltest/f32test/server/t_alert.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/t_alert.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -15,7 +15,6 @@
 // 
 //
 
-#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include <e32math.h>
@@ -164,7 +163,7 @@
 	
 	RThread clientThread;
 	TInt r=clientThread.Create(_L("TALERT_Thread0"),FileAccess,0x4000,KHeapSize,KHeapSize,(TAny*)&gPathThread0,EOwnerThread);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	clientThread.Resume();
 	clientThread.Close();
 	}
@@ -177,7 +176,7 @@
 	
 	RThread clientThread;
 	TInt r=clientThread.Create(_L("TALERT_Thread1"),FileAccess,0x4000,KHeapSize,KHeapSize,(TAny*)&gPathThread1,EOwnerThread);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	clientThread.Resume();
 	clientThread.Close();
 	}
@@ -190,7 +189,7 @@
 	
 	RThread clientThread;
 	TInt r=clientThread.Create(_L("TALERT_Thread2"),FileAccess,0x4000,KHeapSize,KHeapSize,(TAny*)&gPathThread2,EOwnerThread);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	clientThread.Resume();
 	clientThread.Close();
 	}
@@ -248,7 +247,7 @@
 	
 	RThread clientThread;
 	TInt r=clientThread.Create(_L("TALERT_Thread3"),NotifyAccess,0x4000,KHeapSize,KHeapSize,NULL,EOwnerThread);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	clientThread.Resume();
 	clientThread.Close();
 	}
@@ -278,7 +277,7 @@
 	
 	RThread clientThread;
 	TInt r=clientThread.Create(_L("TALERT_Thread4"),MediaChange,0x4000,KHeapSize,KHeapSize,NULL,EOwnerThread);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	clientThread.SetPriority(EPriorityMore);
 	clientThread.Resume();
 	clientThread.Close();
@@ -325,7 +324,7 @@
 		t.Close();
 	}
 	else 
-		test_Value(r, r == KErrNotFound);
+		test(r==KErrNotFound);
 
 	r=t.Open(_L("TALERT_Thread1"),EOwnerThread);
 	if(r==KErrNone)
@@ -334,7 +333,7 @@
 		t.Close();
 	}
 	else 
-		test_Value(r, r == KErrNotFound);
+		test(r==KErrNotFound);
 
 	r=t.Open(_L("TALERT_Thread2"),EOwnerThread);
 	if(r==KErrNone)
@@ -343,7 +342,7 @@
 		t.Close();
 	}
 	else 
-		test_Value(r, r == KErrNotFound);
+		test(r==KErrNotFound);
 
 	r=t.Open(_L("TALERT_Thread3"),EOwnerThread);
 	if(r==KErrNone)
@@ -352,7 +351,7 @@
 		t.Close();
 	}
 	else 
-		test_Value(r, r == KErrNotFound);
+		test(r==KErrNotFound);
 	
 	r=t.Open(_L("TALERT_Thread4"),EOwnerThread);
 	if(r==KErrNone)
@@ -361,7 +360,7 @@
 		t.Close();
 	}
 	else 
-		test_Value(r, r == KErrNotFound);
+		test(r==KErrNotFound);
 	
 /*	TFindThread threadFinder(_L("TALERT_*"));
 	FOREVER
@@ -371,11 +370,11 @@
 		test.Printf(_L("r=%d"),r);
 		if (r==KErrNotFound)
 			break;
-		test_KErrNone(r);
+		test(r==KErrNone);
 		test.Printf(_L("Killing Thread %S\n"),&threadName);
 		RThread t;
 		r=t.Open(threadName,EOwnerThread);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		t.Kill(KErrCancel);
 		t.Close();
 		} */
@@ -389,9 +388,9 @@
 	{
 	test.Next(_L("Create lots of threads and change notifiers"));
 	TInt r=TheFs.MkDirAll(gPathThread1);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	r=TheFs.MkDir(gPathThread2);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 
 	StartThread0(); // Read and write to D:
 	StartThread1(); // Read and write to C:
@@ -438,12 +437,12 @@
 
 	test.Next(_L("Create a hung server and kill the thread it is writing to"));
 	TInt r=TheFs.MkDir(gPathThread0);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	StartThread4(); // Generate media changes
 
 	RThread clientThread;
 	r=clientThread.Create(_L("TALERT_ThreadHangTest"),ThreadHangTest,0x4000,KHeapSize,KHeapSize,NULL,EOwnerThread);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TRequestStatus status;
 	clientThread.Logon(status);
 	clientThread.Resume();
@@ -477,7 +476,7 @@
 	r=TheFs.MkDir(gPathThread0); // Check fileserver ok
 	if(r!=KErrNone && r!=KErrAlreadyExists)
 		test.Printf(_L("r=%d"),r);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	
 	}		
 
@@ -514,7 +513,7 @@
 	FileMan=CFileMan::NewL(TheFs);
 	TInt r=FileMan->RmDir(_L("\\F32-TST\\TALERT\\"));
 	test.Printf(_L("r=%d"),r);
-	test_Value(r, r == KErrNone || r==KErrPathNotFound);
+	test(r==KErrNone || r==KErrPathNotFound);
 	delete FileMan;
 */
 	}