--- a/kerneltest/f32test/server/t_findcapall.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/t_findcapall.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -20,7 +20,6 @@
 // 
 //
 
-#define __E32TEST_EXTENSION__
 #include <e32test.h>
 #include <f32file.h>
 
@@ -48,7 +47,7 @@
 	
 	Err=FileServer.Connect();
 	
-	test_KErrNone(Err);
+	test(Err==KErrNone);
 	
     // RTest.Next is called from function "TestFind()".
     // RTest.Start is called here to start the test.
@@ -65,7 +64,7 @@
 			     _L("z:\\sys\\bin\\"),
 			     _L("nonexistingfile.txt"));
 	
-	test_Value(Err, Err == KErrNotFound);
+	test(Err==KErrNotFound);
 	
 	// Test: Find existing file in existing /sys folder
 	//
@@ -78,7 +77,7 @@
 			     _L("z:\\sys\\bin\\"),
 			     _L("t_findcaptestfile.txt"));
 	
-	test_KErrNone(Err);
+	test(Err==KErrNone);
 	
 	// Test: Find non existing file in existing / non existing /sys folder
 	//
@@ -91,7 +90,7 @@
 			     _L("c:\\sys\\"),
 			     _L("nonexisting.txt"));
 	
-	test_Value(Err, Err == KErrNotFound);
+	test(Err==KErrNotFound);
 	
 	// Test: Find existing file in /sys folder without specifying the path
 	//
@@ -104,7 +103,7 @@
 			     _L("\\sys\\bin\\"),
 			     _L("t_findcaptestfile.txt"));
 	
-	test_KErrNone(Err);
+	test(Err==KErrNone);
 	
 	// Test: Find non existing file in /sys folder without specifying the path
 	//
@@ -117,7 +116,7 @@
 			     _L("\\sys\\"),
 			     _L("nonexisting.txt"));
 	
-	test_Value(Err, Err == KErrNotFound);
+	test(Err==KErrNotFound);
 	
 	FileServer.Close();