Mercurial Mercurial > oss > FCL > sf > os > kernelhwsrv / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
kerneltest/f32test/server/b_osfil.cpp
branchRCL_3
changeset 257 3e88ff8f41d5
parent 256 c1f20ce4abcf 
--- a/kerneltest/f32test/server/b_osfil.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/b_osfil.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -15,7 +15,6 @@
 // 
 //
 
-#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include "t_server.h"
@@ -48,18 +47,18 @@
 	{
 	TEntry entry;
 	TInt r=TheFs.Entry(noDevice,entry);
-	test_Value(r, (r == KErrNotReady)||(r==KErrPathNotFound));
+	test((r==KErrNotReady)||(r==KErrPathNotFound));
 	r=TheFs.Entry(noDirectory,entry);
-	test_Value(r, r == KErrPathNotFound);
+	test(r==KErrPathNotFound);
 	r=TheFs.Entry(noFile,entry);
-	test_Value(r, r == KErrNotFound);
+	test(r==KErrNotFound);
 	r=TheFs.Entry(existsFile,entry);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(entry.iSize==KSizeExistsFile);
 	test(!entry.IsDir());
 	test(!(entry.iAtt&KEntryAttDir));
 	r=TheFs.Entry(existsFile2,entry);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(entry.iSize==KSizeExistsFile2);
 	test(!entry.IsDir());
 	test(!(entry.iAtt&KEntryAttDir));
@@ -71,20 +70,20 @@
 */
 	{
 	TInt r=TheFs.Delete(noDevice);
-	test_Value(r, (r == KErrNotReady)||(r==KErrPathNotFound));
+	test((r==KErrNotReady)||(r==KErrPathNotFound));
 	r=TheFs.Delete(noDirectory);
-	test_Value(r, r == KErrPathNotFound);
+	test(r==KErrPathNotFound);
 	r=TheFs.Delete(noFile);
-	test_Value(r, r == KErrNotFound);
+	test(r==KErrNotFound);
 	r=TheFs.Delete(existsFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(existsFile2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TEntry entry;
 	r=TheFs.Entry(existsFile,entry);
-	test_Value(r, r == KErrNotFound);
+	test(r==KErrNotFound);
 	r=TheFs.Entry(existsFile2,entry);
-	test_Value(r, r == KErrNotFound);
+	test(r==KErrNotFound);
 	}
 
 LOCAL_C void TestRename()
@@ -93,50 +92,50 @@
 */
 	{
 	TInt r=TheFs.Rename(noDevice,fileName);
-	test_Value(r, r == KErrArgument);
+	test(r==KErrArgument);
 	r=TheFs.Rename(noDirectory,fileName);
-	test_Value(r, r == KErrPathNotFound);
+	test(r==KErrPathNotFound);
 	r=TheFs.Rename(noFile,fileName);
-	test_Value(r, r == KErrNotFound);
+	test(r==KErrNotFound);
 	r=TheFs.Rename(existsFile,existsFile2);
-	test_Value(r, r == KErrAlreadyExists);
+	test(r==KErrAlreadyExists);
 	r=TheFs.Delete(existsFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Rename(existsFile,existsFile);
-	test_Value(r, r == KErrNotFound);
+	test(r==KErrNotFound);
 	r=TheFs.Rename(existsFile2,existsFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TEntry entry;
 	r=TheFs.Entry(existsFile2,entry);
-	test_Value(r, r == KErrNotFound);
+	test(r==KErrNotFound);
 	r=TheFs.Entry(existsFile,entry);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(existsFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 LOCAL_C void TestMkDir()
 	{
 	TParse fparse;
 	TInt r=TheFs.MkDirAll(directoryFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TEntry entry;
 	r=TheFs.Entry(directoryFile.Left(directoryFile.Length()-1),entry);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(entry.IsDir());
 	test(entry.iAtt&KEntryAttDir);
 	r=TheFs.RmDir(directoryFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fparse.Set(directoryFile,NULL,NULL);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fparse.PopDir();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.RmDir(fparse.DriveAndPath());
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fparse.PopDir();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.RmDir(fparse.DriveAndPath());
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 
@@ -149,108 +148,108 @@
 	RFile p2;
 
 	TInt r=p1.Open(TheFs,noDevice,EFileStreamText);
-	test_Value(r, (r == KErrNotReady)||(r==KErrPathNotFound));
+	test((r==KErrNotReady)||(r==KErrPathNotFound));
 	r=p1.Open(TheFs,noDirectory,EFileStreamText);
-	test_Value(r, r == KErrPathNotFound);
+	test(r==KErrPathNotFound);
 	TFileName generated1;
 	r=p1.Temp(TheFs,noDevicePath,generated1,EFileStreamText);
-	test_Value(r, (r == KErrNotReady)||(r==KErrPathNotFound));
+	test((r==KErrNotReady)||(r==KErrPathNotFound));
 	r=p1.Temp(TheFs,noDirectoryPath,generated1,EFileStreamText);
-	test_Value(r, r == KErrPathNotFound);
+	test(r==KErrPathNotFound);
 
 	r=p1.Temp(TheFs,_L(""),generated1,EFileStreamText);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TFileName generated2;
 	r=p2.Temp(TheFs,_L(""),generated2,EFileStreamText);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(generated1!=generated2);
 	p1.Close();
 	TFileName generated3;
 	r=p1.Temp(TheFs,_L(""),generated3,EFileStream);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(generated3!=generated2);
 	test(generated3!=generated1);
 	p2.Close();
 	p1.Close();
 
 	r=TheFs.Delete(generated1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(generated2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(generated3);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=p1.Temp(TheFs,_L(""),generated1,EFileStreamText);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=p2.Temp(TheFs,_L(""),generated2,EFileStreamText);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(generated1!=generated2);
 	p1.Close();
 	r=p1.Temp(TheFs,_L(""),generated3,EFileStream);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(generated3!=generated2);
 	test(generated3!=generated1);
 	p2.Close();
 	p1.Close();
 
 	r=TheFs.Delete(generated1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(generated2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(generated3);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.MkDir(openUniqueDir);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=p1.Temp(TheFs,openUniqueDir,generated1,EFileStream);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=p2.Temp(TheFs,openUniqueDir,generated2,EFileStreamText|EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=p1.Write(_L8("junk"),4);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TInt pos=0;
 	r=p1.Seek(ESeekCurrent,pos);//P_FSET
-	test_KErrNone(r);
+	test(r==KErrNone);
 	p1.Close();
 	p2.Close();
 	
 	r=TheFs.Delete(generated1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(generated2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=p1.Temp(TheFs,openUniqueDir,generated1,EFileStream);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=p2.Temp(TheFs,openUniqueDir,generated2,EFileStreamText);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	p1.Close();
 
 	pos=0;
 	r=p2.Seek(ESeekStart,pos);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	p2.Close();
 	r=TheFs.Delete(generated1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(generated2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.RmDir(openUniqueDir);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 LOCAL_C void TestPaths()
 	{
 	TFileName path1;
 	TInt r=TheFs.SessionPath(path1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.SetSessionPath(path1);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TFileName path2;
 	r=TheFs.SessionPath(path2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(path1==path2);
 	RDir dir;
 	r=dir.Open(TheFs,path1,0);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	dir.Close();
 	}
 
@@ -258,7 +257,7 @@
 	{
 	TEntry blk;
 	TInt r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	TEntry blk1=blk;
 
 /* Toggle the write attribute */
@@ -274,9 +273,9 @@
 		set=KEntryAttReadOnly;
 		}
 	r=TheFs.SetEntry(existsFile,blk1.iModified,set,clear);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsReadOnly())
 		test(!blk.IsReadOnly());
 	else
@@ -284,9 +283,9 @@
 
 /* set write attrib back */
 	r=TheFs.SetEntry(existsFile,blk1.iModified,clear,set);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsReadOnly())
 		test(blk.IsReadOnly());
 	else
@@ -304,18 +303,18 @@
 		set=KEntryAttArchive;
 		}
 	r=TheFs.SetEntry(existsFile,blk1.iModified,set,clear);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsArchive())
 		test(!blk.IsArchive());
 	else
 		test(blk.IsArchive());
 /* set archive attrib back */
 	r=TheFs.SetEntry(existsFile,blk1.iModified,clear,set);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsArchive())
 		test(blk.IsArchive());
 	else
@@ -333,18 +332,18 @@
 		set=KEntryAttHidden;
 		}
 	r=TheFs.SetEntry(existsFile,blk1.iModified,set,clear);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsHidden())
 		test(!blk.IsHidden());
 	else
 		test(blk.IsHidden());
 /* set hidden attrib back */
 	r=TheFs.SetEntry(existsFile,blk1.iModified,clear,set);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsHidden())
 		test(blk.IsHidden());
 	else
@@ -362,26 +361,26 @@
 		set=KEntryAttSystem;
 		}
 	r=TheFs.SetEntry(existsFile,blk1.iModified,set,clear);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsSystem())
 		test(!blk.IsSystem());
 	else
 		test(blk.IsSystem());
 /* set system attrib back */
 	r=TheFs.SetEntry(existsFile,blk1.iModified,clear,set);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Entry(existsFile,blk);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	if (blk1.IsSystem())
 		test(blk.IsSystem());
 	else
 		test(!blk.IsSystem());
 	r=TheFs.Delete(existsFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.Delete(existsFile2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 
@@ -389,15 +388,15 @@
 	{
 	RFile fcb;
 	TInt r=fcb.Replace(TheFs,existsFile,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fcb.Write(_L8("ABCDEFGHIJKLMNOPQRSTUVWXYZ"),KSizeExistsFile);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fcb.Close();
 
 	r=fcb.Replace(TheFs,existsFile2,EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fcb.Write(_L8("bcdefghijklmnopqrstuvwxyz"),KSizeExistsFile2);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fcb.Close();
 	}
 
@@ -410,7 +409,7 @@
 
 	TVolumeInfo di;
 	TInt r=TheFs.Volume(di);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test.Start(_L("Info()"));
 	CreateTestFiles();
 	TestInfo();
FCL/sf/os/kernelhwsrv