--- a/kerneltest/f32test/server/t_localeutils_cp932.cpp	Mon May 03 13:47:38 2010 +0300
+++ b/kerneltest/f32test/server/t_localeutils_cp932.cpp	Fri May 14 17:13:29 2010 +0300
@@ -43,7 +43,7 @@
 	{
 
     TInt nRes = ReadBootSector(TheFs, CurrentDrive(), KBootSectorNum<<KDefaultSectorLog2, aBootSector);
-    test(nRes == KErrNone);
+    test_KErrNone(nRes);
 
     if(!aBootSector.IsValid())
         {
@@ -254,7 +254,7 @@
 	_LIT(KVolumeLabelOverflow,		"\x65B0\x65B0\x65B0\x65B0\x65B0\x65B0");
 	r = TheFs.SetVolumeLabel(KVolumeLabelOverflow, driveNum);
 	// locale dll and codepage dll both return diff retrun values so check against both cases.
-	test((r == KErrBadName) || (r == KErrOverflow));
+	test_Value(r, (r == KErrBadName) || (r == KErrOverflow));
 
 	r = TheFs.Volume(vInfo, driveNum);
 	test_KErrNone(r);
@@ -702,12 +702,12 @@
 	TFileName fn = _L("\\ABCD");
 	
 	TInt r=file.Create(TheFs,fn,EFileRead);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 
 	//	Assume this file is the first entry in the root directory
 	r=TheDisk.Open(TheFs,CurrentDrive());
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
     //-- read the 1st dir entry, it should be a DOS entry 
     const TInt posEntry1=gBootSector.RootDirStartSector() << KDefaultSectorLog2; //-- dir entry1 position
@@ -747,9 +747,9 @@
 	
 	TEntry entry;
 	TInt err = TheFs.Entry(fn, entry);
-	test(err==KErrNone);
+	test_KErrNone(err);
 	err = TheFs.Delete(fn);
-	test(err==KErrNone);
+	test_KErrNone(err);
 #else
 	test.Printf(_L("Test only runs on DEBUG builds, see test logs of debug builds for details."));
 #endif  // _DEBUG) || _DEBUG_RELEASE
@@ -779,13 +779,13 @@
 	
 	test.Next(_L("create file \"AB\" under root directory"));
 	TInt r=file.Create(TheFs,fn,EFileRead);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	file.Close();
 
 	test.Next(_L("manually change file name to \"0x7F0x450x7F0x45\" via raw disk accessing"));
 	//	Assume this file is the first entry in the root directory
 	r=TheDisk.Open(TheFs,CurrentDrive());
-	test(r==KErrNone);
+	test_KErrNone(r);
 	
     //-- read the first dir entry, it should be a DOS entry 
     const TInt posEntry1=gBootSector.RootDirStartSector() << KDefaultSectorLog2; //-- dir entry1 position
@@ -870,15 +870,15 @@
 	_LIT(KShortName, "\x3055\x307E\x3056~1");
 	TFileName sn;
 	r = TheFs.GetShortName(fn, sn);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	r = sn.Compare(KShortName);
-	test(r==0);
+	test_Value(r, r == 0);
 	
 	r = TheFs.ScanDrive(_L("gSessionPath"));
-	test(r==KErrNone);
+	test_KErrNone(r);
 
 	r = TheFs.Delete(fn);
-	test(r == KErrNone);
+	test_KErrNone(r);
 #else
 	test.Printf(_L("Test only runs on DEBUG builds, see test logs of debug builds for details."));
 #endif  // _DEBUG) || _DEBUG_RELEASE