FCL/sf/os/kernelhwsrv: comparison kerneltest/f32test/server/t

equal deleted inserted replaced

-:4122176ea935
+:56f325a607ea
 LOCAL_C void Compare(const TDesC& aDir1,const TDesC& aDir2)
 //
 // Test that the contents of two directories are identical
 //
 	{
 	CDirScan* scanDir1=CDirScan::NewL(TheFs);
 	scanDir1->SetScanDataL(aDir1,KEntryAttMaskSupported,ESortByName);
 	CDirScan* scanDir2=CDirScan::NewL(TheFs);
 	scanDir2->SetScanDataL(aDir2,KEntryAttMaskSupported,ESortByName);
 		}
 	RmDir(_L("\\longname1\\"));
 	return ret;
 	}
-	LOCAL_C void TestDelete()
+LOCAL_C void TestDelete()
 //
 // Test files are deleted
 //
 	{
+	test.Next(_L("Test delete - Set up files and start deleting"));
-	test.Next(_L("Set up files and start deleting"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\DELDIR\\DELTEST\\EMPTY\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\DELDIR\\FILE1.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\DELDIR\\FILE2.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\DELDIR\\FILE3.TXT"));
 TFSName f;
 	r = TheFs.FileSystemName(f, theDrive);
 	test(r == KErrNone || r == KErrNotFound);
 if (f.FindF(_L("Fat")) == 0 )
 	{
+		test.Next(_L("Test wild card matching in short file names"));
 	MakeFile(_L("abcdefghi.txt"));
 	TInt err = gFileMan->Delete(_L("ABCDEF~*"));
 	test(err == KErrNone);
 	MakeFile(_L("abcdefghi.txt"));
 	err = gFileMan->Delete(_L("ABCDEF~*.TXT"));
 LOCAL_C void TestCopy()
 //
 // Test copy
 //
 	{
 	test.Next(_L("Test copy"));
 	RmDir(_L("\\F32-TST\\TFMAN\\COPYDIR\\*"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\COPYDIR\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\DELDIR\\DELTEST\\EMPTY\\"));
 	test.Next(_L("Test copy files to the same directory"));
 	TInt r;
 	if (testingInvalidPathLengths)
-//	Create a path of greater 256 characters by renaming a directory and check it can be
+		// Create a path of greater than 256 characters by renaming a directory and
-//	manipulated (tests fix to F32)
+		// check it can be manipulated (tests fix to F32)
 		{
 		MakeDir(_L("\\START\\LONG\\"));
 		MakeDir(_L("\\FINISH\\"));
 		MakeFile(_L("\\START\\LONG\\ABCDEFGH01ABCDEFGH01ABCDEFGH01ABCDEFGH01.txt"));
 		MakeFile(_L("\\START\\LONG\\ELEPHANT01ELEPHANT02ELEPHANT03ELEPHANT04.txt"));
 	r=gFileMan->Delete(_L("\\F32-TST\\TFMAN\\AFTER\\RUMBA?.TXT"));
 	test(r==KErrNone);
 	r=gFileMan->Delete(_L("\\F32-TST\\TFMAN\\DELDIR\\RUMBA?.TXT"));
 	test(r==KErrNone);
+	}
-	}
 LOCAL_C void TestDEF121663_Setup(TFileName& aSrcPath)
 	{
 	RmDir(aSrcPath);
 	MakeDir(aSrcPath);
 		}
 	}
 LOCAL_C void TestDEF121663()
 	{
-	test.Next(_L("++TestDEF121663"));
+	test.Next(_L("Test moving directory to its subdirectory (DEF121663)"));
 	gFileMan->SetObserver(NULL);
 	TInt err = 0;
 	TFileName srcPath = _L("C:\\TestDEF121663\\");
 	TestResult(err,KErrInUse,KErrInUse);
 	gFileMan->SetObserver(gObserver);
 	// remove previous dirs
 	RmDir(_L("C:\\TestDEF121663\\"));
-	test.Next(_L("--TestDEF121663"));
+	}
-	}
+// Test moving directories where source and target have matching subdirectory structures
 LOCAL_C void TestDEF123575()
 	{
-	test.Next(_L("++TestDEF123575"));
+	test.Next(_L("Test moving directories with matching subdirectory structures (DEF123575)"));
 	TFileName srcPath;
 	TFileName destPath;
 	TInt err;
 	//setup the initial directory structure
 	srcPath = _L("\\F32-TST\\DEF123575\\SRCDIR\\CommonDIR\\temp\\temp1.1\\");
 	MakeFile(_L("\\F32-TST\\DEF123575\\AFTER\\CommonDIR\\temp\\temp1.1\\FILE1.TXT"));
 	Compare(_L("\\F32-TST\\DEF123575\\DSTDIR\\*"),_L("\\F32-TST\\DEF123575\\AFTER\\*"));
 	//delete the entire directory structure
 	RmDir(_L("\\F32-TST\\DEF123575\\*"));
-	test.Next(_L("--TestDEF123575"));
 	}
 LOCAL_C void TestDEF125570()
 	{
-	test.Next(_L("++TestDEF125570"));
+	test.Next(_L("Test move when trg has at least one of the src dirs (DEF125570)"));
 	gFileMan->SetObserver(NULL);
 	TInt err = KErrNone;
 	TFileName srcPath = _L("C:\\TestDEF125570\\src\\");
 	TFileName trgPath = _L("C:\\TestDEF125570\\trg\\");
 		err = gFileMan->Move(srcPath, trgPath, CFileMan::ERecurse|CFileMan::EOverWrite, gStat);
 	TestResult(err);
 	gFileMan->SetObserver(gObserver);
 	// remove previous dirs
 	RmDir(_L("C:\\TestDEF125570\\"));
-	test.Next(_L("--TestDEF125570"));
 	}
 LOCAL_C void TestDEF130404()
 	{
-	test.Printf(_L("++TestDEF130404"));
+	test.Printf(_L("Test move when the src doesn't fully exist (DEF130404)"));
 	TInt r = 0;
 	TFileName trgPath;
 	trgPath.Format(_L("%c:\\TestDEF130404\\Trg\\"), (TUint8)gDriveToTest);
 	TFileName srcPath;
 	// clean up before leaving
 	trgPath.Format(_L("%c:\\TestDEF130404\\"), (TUint8)gDriveToTest);
 	RmDir(trgPath);
 	RmDir(_L("C:\\TestDEF130404\\"));
-	test.Printf(_L("--TestDEF130404"));
 	}
 /**
 This is to test that moving files to overwrite folders with the same names
-returns proper error code.
+and moving folders (directories) to overwrite files with the same names
+across drives return proper error codes
 */
 void TestPDEF137716()
 	{
-	test.Next(_L("Test moving files to overwrite folders or folders to files"));
+	// Do not run tests if we cannot move across different drives
+	if (gSessionPath[0]=='C')
-	TInt err = KErrNone;
+		return;
+	// Move FILE to overwrite FOLDER --------------------------------------------------------
+	test.Next(_L("Test moving files to overwrite folders with the same names"));
 	gFileMan->SetObserver(NULL);
-#if defined(__WINS__)
+	_LIT(KFixedTargetTestFolder,		"\\PDEF137716\\");
-	_LIT(KFileToDirTargetName,			"Y:\\PDEF137716\\FileToDir_Target\\ITEM");
+	_LIT(KFileToDirTargetCreatePath,	"\\PDEF137716\\FileToDir_Target\\ITEM\\");
-	_LIT(KFileToDirTargetNameWild,		"Y:\\PDEF137716\\FileToDir_Target\\");
+	_LIT(KFileToDirTargetNameWild,		"\\PDEF137716\\FileToDir_Target\\");
-	_LIT(KFixedTargetTestFolder,		"Y:\\PDEF137716\\");
+	_LIT(KFixedSourceTestFolder,		"C:\\PDEF137716\\");
-	_LIT(KFileToDirTargetCreatePath,	"Y:\\PDEF137716\\FileToDir_Target\\ITEM\\");
+	_LIT(KFileToDirSourceName,			"C:\\PDEF137716\\FileToDir_Source\\ITEM");
-#else
+	_LIT(KFileToDirSourceNameWild,		"C:\\PDEF137716\\FileToDir_Source\\");
-	_LIT(KFileToDirTargetName,			"D:\\PDEF137716\\FileToDir_Target\\ITEM");
-	_LIT(KFileToDirTargetNameWild,		"D:\\PDEF137716\\FileToDir_Target\\");
-	_LIT(KFixedTargetTestFolder,		"D:\\PDEF137716\\");
-	_LIT(KFileToDirTargetCreatePath,	"D:\\PDEF137716\\FileToDir_Target\\ITEM\\");
-#endif
-	_LIT(KFixedSrouceTestFolder,		"\\PDEF137716\\");
-	_LIT(KFileToDirSourceName,			"\\PDEF137716\\FileToDir_Source\\ITEM");
-	_LIT(KFileToDirSourceNameWild,		"\\PDEF137716\\FileToDir_Source\\");
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeDir(KFileToDirTargetCreatePath);
 	MakeFile(KFileToDirSourceName);
-	err = gFileMan->Move(KFileToDirSourceName, KFileToDirTargetNameWild, 0);
+	TInt err = KErrNone;
-	test(err == KErrAccessDenied);
+	if(!gAsynch)
+		{
+		err = gFileMan->Move(KFileToDirSourceName, KFileToDirTargetNameWild, 0);
+		}
+	else
+		{
+		err = gFileMan->Move(KFileToDirSourceName, KFileToDirTargetNameWild, 0, gStat);
+		}
+	TestResult(err,KErrAccessDenied);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
+	MakeDir(KFileToDirTargetCreatePath);
+	MakeFile(KFileToDirSourceName);
+	if(!gAsynch)
+		{
+		err = gFileMan->Move(KFileToDirSourceName, KFileToDirTargetNameWild, CFileMan::EOverWrite);
+		}
+	else
+		{
+		err = gFileMan->Move(KFileToDirSourceName, KFileToDirTargetNameWild, CFileMan::EOverWrite, gStat);
+		}
+	TestResult(err,KErrAccessDenied);
+	RmDir(KFixedTargetTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeDir(KFileToDirTargetCreatePath);
 	MakeFile(KFileToDirSourceName);
-	err = gFileMan->Move(KFileToDirTargetName, KFileToDirSourceNameWild, CFileMan::EOverWrite);
+	if(!gAsynch)
-	test(err == KErrAccessDenied);
+		{
+		err = gFileMan->Move(KFileToDirSourceNameWild, KFileToDirTargetNameWild, 0);
+		}
+	else
+		{
+		err = gFileMan->Move(KFileToDirSourceNameWild, KFileToDirTargetNameWild, 0, gStat);
+		}
+	TestResult(err,KErrAccessDenied);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeDir(KFileToDirTargetCreatePath);
 	MakeFile(KFileToDirSourceName);
-	err = gFileMan->Move(KFileToDirSourceNameWild, KFileToDirTargetNameWild, 0);
+	if(!gAsynch)
-	test(err == KErrAccessDenied);
+		{
+		err = gFileMan->Move(KFileToDirSourceNameWild, KFileToDirTargetNameWild, CFileMan::EOverWrite);
+		}
+	else
+		{
+		err = gFileMan->Move(KFileToDirSourceNameWild, KFileToDirTargetNameWild, CFileMan::EOverWrite, gStat);
+		}
+	TestResult(err,KErrAccessDenied);
+	// Move FOLDER to overwrite FILE --------------------------------------------------------
+	test.Next(_L("Test moving folders to overwrite files with the same names"));
+	_LIT(KDirToFileTargetName,			"\\PDEF137716\\DirToFile_Target\\ITEM");
+	_LIT(KDirToFileTargetNameWild,		"\\PDEF137716\\DirToFile_Target\\");
+	_LIT(KDirToFileSourceName,			"C:\\PDEF137716\\DirToFile_Source\\ITEM");
+	_LIT(KDirToFileSourceNameWild,		"C:\\PDEF137716\\DirToFile_Source\\");
+	_LIT(KDirToFileSourceCreatePath,	"C:\\PDEF137716\\DirToFile_Source\\ITEM\\");
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
-	MakeDir(KFileToDirTargetCreatePath);
-	MakeFile(KFileToDirSourceName);
-	err = gFileMan->Move(KFileToDirSourceNameWild, KFileToDirTargetNameWild, CFileMan::EOverWrite);
-	test(err == KErrAccessDenied);
-#if defined(__WINS__)
-	_LIT(KDirToFileTargetName,			"Y:\\PDEF137716\\DirToFile_Target\\ITEM");
-	_LIT(KDirToFileTargetNameWild,		"Y:\\PDEF137716\\DirToFile_Target\\");
-#else
-	_LIT(KDirToFileTargetName,			"D:\\PDEF137716\\DirToFile_Target\\ITEM");
-	_LIT(KDirToFileTargetNameWild,		"D:\\PDEF137716\\DirToFile_Target\\");
-#endif
-	_LIT(KDirToFileSourceName,			"\\PDEF137716\\DirToFile_Source\\ITEM");
-	_LIT(KDirToFileSourceNameWild,		"\\PDEF137716\\DirToFile_Source\\");
-	_LIT(KDirToFileSourceCreatePath,	"\\PDEF137716\\DirToFile_Source\\ITEM\\");
-	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
 	MakeFile(KDirToFileTargetName);
 	MakeDir(KDirToFileSourceCreatePath);
-	err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetName, 0);
+	if(!gAsynch)
-	test(err == KErrAccessDenied);
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetName, 0);
+		}
+	else
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetName, 0, gStat);
+		}
+	TestResult(err,KErrAccessDenied,KErrAccessDenied);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeFile(KDirToFileTargetName);
 	MakeDir(KDirToFileSourceCreatePath);
-	err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetName, CFileMan::EOverWrite);
+	if(!gAsynch)
-	test(err == KErrAccessDenied);
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetName, CFileMan::EOverWrite);
+		}
+	else
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetName, CFileMan::EOverWrite, gStat);
+		}
+	TestResult(err,KErrAccessDenied,KErrAccessDenied);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeFile(KDirToFileTargetName);
 	MakeDir(KDirToFileSourceCreatePath);
-	err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetNameWild, 0);
+	if(!gAsynch)
-	test(err == KErrAccessDenied);
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetNameWild, 0);
+		}
+	else
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetNameWild, 0, gStat);
+		}
+	TestResult(err,KErrAccessDenied,KErrAccessDenied);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeFile(KDirToFileTargetName);
 	MakeDir(KDirToFileSourceCreatePath);
-	err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetNameWild, CFileMan::EOverWrite);
+	if(!gAsynch)
-	test(err == KErrAccessDenied);
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetNameWild, CFileMan::EOverWrite);
+		}
+	else
+		{
+		err = gFileMan->Move(KDirToFileSourceName, KDirToFileTargetNameWild, CFileMan::EOverWrite, gStat);
+		}
+	TestResult(err,KErrAccessDenied,KErrAccessDenied);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeFile(KDirToFileTargetName);
 	MakeDir(KDirToFileSourceCreatePath);
 	err = gFileMan->Move(KDirToFileSourceNameWild, KDirToFileTargetNameWild, 0);
-	test(err == KErrNotFound);
+	if(!gAsynch)
+		{
+		err = gFileMan->Move(KDirToFileSourceNameWild, KDirToFileTargetNameWild, 0);
+		}
+	else
+		{
+		err = gFileMan->Move(KDirToFileSourceNameWild, KDirToFileTargetNameWild, 0, gStat);
+		}
+	TestResult(err,KErrNotFound);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
 	MakeFile(KDirToFileTargetName);
 	MakeDir(KDirToFileSourceCreatePath);
-	err = gFileMan->Move(KDirToFileSourceNameWild, KDirToFileTargetNameWild, CFileMan::EOverWrite);
+	if(!gAsynch)
-	test(err == KErrNotFound);
+		{
+		err = gFileMan->Move(KDirToFileSourceNameWild, KDirToFileTargetNameWild, CFileMan::EOverWrite);
+		}
+	else
+		{
+		err = gFileMan->Move(KDirToFileSourceNameWild, KDirToFileTargetNameWild, CFileMan::EOverWrite, gStat);
+		}
+	TestResult(err,KErrNotFound);
 	RmDir(KFixedTargetTestFolder);
-	RmDir(KFixedSrouceTestFolder);
+	RmDir(KFixedSourceTestFolder);
+	gFileMan->SetObserver(gObserver);
 	}
 LOCAL_C void TestMove()
 //
 // Test Move
 //
 	{
 	test.Next(_L("Test move"));
 	RmDir(_L("\\F32-TST\\TFMAN\\MOVEDIR\\*"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\MOVEDIR\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\DELDIR\\DELTEST\\EMPTY\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\DELDIR\\EXE2.BIN"));
 	TInt r=KErrNone;
 	if (testingInvalidPathLengths)
-//	Create a path of greater 256 characters by renaming a directory and check it can be
+		//	Create a path of greater 256 characters by renaming a directory and check it can be
-//	manipulated (tests fix to F32)
+		//	manipulated (tests fix to F32)
 		{
 		MakeDir(_L("\\START\\LONG\\"));
 		MakeDir(_L("\\FINISH\\"));
 		MakeFile(_L("\\START\\LONG\\ABCDEFGH01ABCDEFGH01ABCDEFGH01ABCDEFGH01.txt"));
 		MakeFile(_L("\\START\\LONG\\ELEPHANT01ELEPHANT02ELEPHANT03ELEPHANT04.txt"));
 		MakeFile(_L("\\START\\LONG\\DINOSAUR01DINOSAUR02DINOSAUR03DINOSAUR04.txt"));
 		MakeFile(_L("\\START\\LONG\\FILEFILE01FILEFILE02FILEFILE03FILEFILE04.txt"));
 		r=gFileMan->Rename(_L("\\START\\LONG"),_L("\\START\\asdffdsa01asdffdsa02asdffdsa03asdffdsa04asdffdsa05asdffdsa06asdffdsa07asdffdsa08asdffdsa09asdffdsa10asdffdsa11asdffdsa12asdffdsa13asdffdsa14asdffdsa15asdffdsa16asdffdsa17asdffdsa18asdffdsa19asdffdsa20asdffdsa21asdffdsa22asdff"),CFileMan::EOverWrite);
 		test(r==KErrNone);
-	//	Two long directory names - makes paths invalid
+		//	Two long directory names - makes paths invalid
 		MakeDir(_L("\\TEST\\LONG\\NAME\\FGHIJ"));
 		MakeDir(_L("\\TEST\\LONG\\NAME\\FGHIJ\\DIRECTORY1DIRECTORY2DIRECTORY3DIRECTORY4\\"));
 		MakeFile(_L("\\TEST\\LONG\\NAME\\FGHIJ\\ELEPHANT01ELEPHANT02ELEPHANT03ELEPHANT04"));
 		MakeFile(_L("\\TEST\\LONG\\NAME\\FGHIJ\\FILEFILE01FILEFILE02FILEFILE03FILEFILE04"));
 		r=gFileMan->Rename(_L("\\TEST\\LONG"),_L("\\TEST\\asdffdsa01asdffdsa02asdffdsa03asdffdsa04asdffdsa05asdffdsa06asdffdsa07asdffdsa08asdffdsa09asdffdsa10asdffdsa11asdffdsa12asdffdsa13asdffdsa14asdffdsa15asdffdsa16asdffdsa17asdffdsa18asdffdsa19asdffdsa20as\\fdsa21asdffds"),CFileMan::EOverWrite);
 	if (testingInvalidPathLengths)
 		{
 		r=gFileMan->RmDir(_L("\\TEST\\"));
 		test(r==KErrNone);
 		}
-	// Test moving directory to its subdirectory
-	TestDEF121663();
+	TestDEF121663(); // Test moving directory to its subdirectory
-	TestDEF123575();
+	TestDEF123575(); // Test moving directories where src and trg have matching subdirectory structures
-	//Test Move when trg has at least one of the src dirs
+	TestDEF125570(); // Test move when trg has at least one of the src dirs
-	TestDEF125570();
+	TestDEF130404(); // Test move when the src doesn't fully exist
-	//Test move when the src doesn't fully exist
+	if (!IsTestingLFFS())
-	TestDEF130404();
+		TestPDEF137716(); // Test moving files to overwrite folders that have the same names
-	// Test moving files to overwrite folders that have the same names.
-	TestPDEF137716();
 	}
 LOCAL_C void TestSimultaneous()
 //
 // Create and run two CFileMen simultaneously
 //
 	{
+	test.Next(_L("Test create and run two CFileMans simultaneously"));
-	test.Next(_L("Create and run two CFileMans simultaneously"));
 	RmDir(_L("\\F32-TST\\TFMAN\\fman2\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\FMAN1\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\FMAN2\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\FMAN1\\ROD.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\AFTER\\FREDRICK.EXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\AFTER\\PETER.EXT"));
 	Compare(_L("\\F32-TST\\TFMAN\\After\\*"),_L("\\F32-TST\\TFMAN\\FMAN2\\*"));
 	}
+// Test wildcards are replaced with letters from the matched file (CFileMan::CreateTargetNameFromSource)
 LOCAL_C void TestDEF092084()
 	{
 	if(gAsynch)
 		{
 		return;
 		}
+	test.Next(_L("Test wildcards are replaced with letters from the matched file (DEF092084)"));
 	MakeDir(_L("\\DEF092084"));
 	MakeFile(_L("\\DEF092084\\FILE1.TXT"));
 	TInt r = gFileMan->Rename(_L("\\DEF092084\\*.TXT"),_L("\\DEF092084\\*.DDB"), CFileMan::EOverWrite);
 	test(r==KErrNone);
 /*
 Test code for INC111038() and executed with Cache enabled and FS_NOT_RUGGED.
 */
 LOCAL_C void TestINC111038()
 	{
-	////////////////////////////////////////////////////////
-	////
 	TInt r;
+	test.Next(_L("Test example of incorrect attribute flushing"));
-	test.Next(_L("Example of incorrect attribute flushing"));
-	////
-	////////////////////////////////////////////////////////
-	////
 	_LIT(KTestFile, "\\TESTFILE.TXT");
+	test.Printf(_L("1: Create Test File\n"));
-	////////////////////////////////////////////////////////
-	//// 2: Create Test File
-	////
-	test.Printf(_L("2: Create Test File\n"));
 	RFile testFile;
 	r = testFile.Create(TheFs, KTestFile, EFileRead | EFileWrite);
 	test(r == KErrNone);
-	////////////////////////////////////////////////////////
+	test.Printf(_L("2: Populate testFile1 Data\n"));
-	//// 3: Populate Data
-	////
-	test.Printf(_L("\n3: Populate testFile1 Data\n"));
 	r = testFile.Write(_L8("ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
 	test(r == KErrNone);
+	test.Printf(_L("3: Get Initial Attributes\n"));
-	////////////////////////////////////////////////////////
-	//// 4: Get Initial Attributes
-	////
-	test.Printf(_L("\n4: Get Initial Attributes\n"));
 	TUint atts = 0;
 	r = testFile.Att(atts);
 	test(r == KErrNone);
-	test.Printf(_L("\n   Attributes: %08x"), atts);
+	test.Printf(_L("   Attributes: %08x"), atts);
-	////////////////////////////////////////////////////////
+	test.Printf(_L("4: Set KEntryAttHidden Attribute\n"));
-	//// 5: Set KEntryAttHidden Attribute
-	////
-	test.Printf(_L("\n5: Set KEntryAttHidden Attribute"));
 	r = testFile.SetAtt(KEntryAttHidden, 0);
 	test(r == KErrNone);
+	test.Printf(_L("5: Verify KEntryAttHidden Attribute is set for testFile1\n"));
-	////////////////////////////////////////////////////////
-	//// 6: Verify KEntryAttHidden Attribute is set
-	////
-	test.Printf(_L("\n6: Verify KEntryAttHidden Attribute is set for testFile1"));
 	r = testFile.Att(atts);
 	test(r == KErrNone);
 	test(atts & KEntryAttHidden);
+	test.Printf(_L("6: Read Data from beginning of file testFile1\n"));
-	////////////////////////////////////////////////////////
-	//// 7: Read Data from beginning of file
-	////
-	test.Printf(_L("\n7: Read Data from beginning of file testFile1\n"));
 	TBuf8<4> data;
 	r = testFile.Read(0, data);
 	test(r == KErrNone);
+	test.Printf(_L("7: Close all the testFiles\n"));
-////////////////////////////////////////////////////////
-	//// 8: Close file
-	////
-	test.Printf(_L("\n8: Close all the testFiles"));
 	testFile.Close();
+	test.Printf(_L("8: Verify KEntryAttHidden is present\n"));
-	////////////////////////////////////////////////////////
-	//// 9: Verify KEntryAttHidden is present
-	////
-	test.Printf(_L("\n9: Verify KEntryAttHidden is present"));
 	r = TheFs.Att(KTestFile, atts);
 	test(r == KErrNone);
-	test.Printf(_L(" \n Finally, attributes are : %08x"), atts);
+	test.Printf(_L("  Finally, attributes are : %08x\n"), atts);
 	test(atts & KEntryAttHidden);
+	test.Printf(_L("9: Delete Test File\n"));
-	test.Printf(_L("10: Delete Test File"));
+	r = TheFs.Delete(KTestFile);
-	 r = TheFs.Delete(KTestFile);
 	test(r == KErrNone || r == KErrNotFound);
 	}
 LOCAL_C void TestDEF113299()
 	{
-	test.Next(_L("TestDEF113299"));
+	test.Next(_L("Test invalid file rename (DEF113299)"));
 	TInt err =0;
 	TFileName srcFileName = _L("C:\\F32-TST\\TFMAN\\DEF113299\\src\\corner.html");
 	TFileName trgFileName = _L("C:\\F32-TST\\TFMAN\\DEF113299\\src\\mi?d**dle.html");
 	TFileName trgInvalidFileName = _L("C:\\F32-TST\\TFMAN\\DEF113299\\src\\mi?d**dle>.html"); // Invalid filename
 	TFileName renamedFileName = _L("C:\\F32-TST\\TFMAN\\DEF113299\\src\\mirderdle.html");
 	RmDir(_L("C:\\F32-TST\\TFMAN\\DEF113299\\"));
 	MakeFile(srcFileName,_L8("Test Data"));
+	// Renaming a file with invalid special characters should fail with error code KErrBadName(-28)
 	if (!gAsynch)
 		err = gFileMan->Rename(srcFileName,trgInvalidFileName);
 	else
 		err = gFileMan->Rename(srcFileName,trgInvalidFileName, 0, gStat);
 	TestResult(err,KErrBadName);
 LOCAL_C void TestRename()
 //
 // Test rename with wildcards
 //
 	{
+	test.Next(_L("Test rename with wildcards"));
-	test.Next(_L("Rename with wildcards"));
 	RmDir(_L("\\F32-TST\\TFMAN\\rename\\dest\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\RENAME\\DEST\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\RENAME\\SRC\\DirTest\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RENAME\\SRC\\abcDEF.TXT"));
 	Compare(_L("\\F32-TST\\TFMAN\\compare\\*"), _L("\\F32-TST\\TFMAN\\dest\\*"));
 	err=TheFs.SetSessionPath(sessionPath);
 	test(err==KErrNone);
-	TestINC109754();
+	TestINC109754(); // Test empty source directory should exist after contents being renamed
-	TestDEF092084();
+	TestDEF092084(); // Test wildcards are replaced with letters from the matched file
-	TestDEF113299();
+	TestDEF113299(); // Test invalid file rename
 	}
 LOCAL_C void TestAttribs()
 //
 // Test attribs
 //
 	{
+	test.Next(_L("Test set file attributes"));
-	test.Next(_L("Set file attributes"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\ATTRIBS\\Attrib1.AT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\ATTRIBS\\Attrib2.at"));
 	TUint legalAttMask=KEntryAttMaskSupported&~(KEntryAttDir|KEntryAttVolume);
 	TUint setMask=KEntryAttReadOnly;
 	test(entry.iName.MatchF(_L("attrib2.AT"))!=KErrNotFound);
 	test(entry.iAtt==0);
 	test(entry.iModified==time);
 	delete entryList;
 	delete scan;
-	TestINC111038();
+	TestINC111038(); // Test example of incorrect attribute flushing
 	}
 LOCAL_C void  TestINC091841()
 	{
 	if(gAsynch)
 		{
 		return;
 		}
+	test.Next(_L("Test delete long fullnames (INC091841)"));
 	MakeDir(_L("\\12345678\\Book\\12345678\\"));
 	TFileName longname;
 	longname.Copy(_L("\\12345678\\Book\\12345678\\12345678901234567890123456789012345678901234567890.x"));
 	MakeFile(longname);
 	TFileName oldname = longname;
 LOCAL_C void TestRmDir()
 //
 // Test rmdir function
 //
 	{
 	test.Next(_L("Test rmdir function"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\RMDIR\\EMPTY\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RMDIR\\ALFRED.txt"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RMDIR\\RICHARD.txt"));
 			{
 			r=gFileMan->RmDir(_L("\\asdffdsa01asdffdsa02asdffdsa03asdffdsa04asdffdsa05asdffdsa06asdffdsa07asdffdsa08asdffdsa09asdffdsa10asdffdsa11asdffdsa12asdffdsa13asdffdsa14asdffdsa15asdffdsa16asdffdsa17asdffdsa18asdffdsa19asdffdsa20asdffdsa21asdffdsa22asdff\\"),gStat);
 			test(r==KErrNone);
 			WaitForSuccess();
 			}
 		}
 	TEntry entry;
 	r=TheFs.Entry(_L("\\F32-TST\\TFMAN\\RMDIR"),entry);
 	test(r==KErrNotFound);
 	test(r==KErrNone);
 	MakeDir(_L("\\F32-TST\\TFMAN\\"));
 	if(testingInvalidPathLengths)
 		{
-		TestINC091841();
+		TestINC091841(); // Test delete long fullnames
 		}
 	//---------------------------------------------
 	//! @SYMTestCaseID			PBASE-T_FMAN-0316
 	//! @SYMTestType			UT
 	//! @SYMTestExpectedResults	The operation completes with the error code KErrInUse.
 	//! @SYMTestPriority		High
 	//! @SYMTestStatus			Implemented
 	//---------------------------------------------
+	test.Next(_L("Test delete directory containing open files"));
 	gFileMan->SetObserver(NULL);
 	MakeDir(_L("\\F32-TST\\TFMAN\\OPENFILE\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\OPENFILE\\FILE.TXT"));
 LOCAL_C void TestRecursiveCopy()
 //
 // Test the recursive copy function
 //
 	{
 	test.Next(_L("Test recursive copy"));
 	RmDir(_L("\\F32-TST\\TFMAN\\COPYDIR\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\COPYDIR\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\DELDIR\\DELTEST\\EMPTY\\"));
 LOCAL_C void TestRecursiveAttribs()
 //
 // Test set attribs recursively
 //
 	{
 	test.Next(_L("Test recursive attribs"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RECATTRIBS\\Attrib1.AT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RECATTRIBS\\Attrib2.at"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RECATTRIBS\\SUBDIR\\ATFILE.TXT"));
 LOCAL_C void TestRecursiveDelete()
 //
 // Test Recursive delete
 //
 	{
 	test.Next(_L("Test recursive delete"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RECDELETE\\FULL\\GRAPE.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RECDELETE\\FULL\\GRAPE.PLP"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RECDELETE\\GRAPE.PLP"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\RECDELETE\\FILE1.TXT"));
 	}
 LOCAL_C void TestINC108401()
 {
-	test.Next(_L("Test INC108401 : starts"));
+	test.Next(_L("Test synchronous and asynchronous move operations (INC108401)"));
 	TInt err = 0;
 	TFileName trgPath = _L("?:\\F32-TST\\");
 	if (gSessionPath[0]!='D'&& gSessionPath[0]!='Y')
 	// cleanup for the current drive
 	RmDir(trgPath);
 	RmDir(_L("\\F32-TST\\"));
-	test.Next(_L("Test INC108401 : ends"));
+	test.Printf(_L("Test INC108401 : ends\n"));
 }
 LOCAL_C void TestINC089638()
 {
 	if(gAsynch)
 		{
 		return;
 		}
+	test.Next(_L("Test all items removed from source directory after recursive moving (INC089638)"));
 	RmDir(_L("\\INC089638\\source\\"));
 	RmDir(_L("\\INC089638\\dest\\"));
 	MakeFile(_L("\\INC089638\\source\\file1"));
 	MakeFile(_L("\\INC089638\\source\\file2"));
 	MakeFile(_L("\\INC089638\\source\\subdir1\\file3"));
 	RmDir(_L("\\INC089638\\"));
 }
 void TestINC101379()
 	{
+	test.Next(_L("Test moving of directory to its subdirectory recursively and not recursively (INC101379)"));
 	TInt err;
 	_LIT(KSourceDir,"\\INC101379\\dir\\");
 	_LIT(KFile1, "\\INC101379\\dir\\file1.txt");
 	_LIT(KFile2, "\\INC101379\\dir\\subdir\\file2.txt");
 	_LIT(KFile3, "\\INC101379\\dir\\other\\file3.txt");
 	RmDir(_L("\\INC101379\\"));
 	}
 void TestINC099600() // and INC101061
 	{
+	// Test move files from the internal drive to an external one (INC099600)
+	// Test move files with system (KEntryAttSystem) or hidden (KEntryAttHidden) attributes (INC101061)
+	test.Next(_L("Test move files from internal drive to external with system and hidden attributes"));
 	_LIT(KDest,"C:\\DEST099600\\");
 	TBuf<64> source;
 	source.Format(_L("%c:\\INC099600\\"), (TUint) gDriveToTest);
 	TBuf<64> src;
 	TInt r;
 	else
 		err = gFileMan->Copy(_L("\\F32-TST\\TFMAN\\INC106735\\*.TXT"), _L("\\F32-TST\\TFMAN\\INC106735\\SUB\\"), CFileMan::ERecurse, gStat);
 	TestResult(err, KErrNone);
 	Compare(_L("\\F32-TST\\TFMAN\\INC106735\\"), _L("\\F32-TST\\TFMAN\\INC106735_COM\\"));
-	TestINC089638();
+	TestINC089638(); // Test all items removed from source directory after recursive moving
-	TestINC101379();
+	TestINC101379(); // Test moving of directory to its subdirectory recursively and not recursively
-	TestINC099600();  // and INC101061
+	TestINC099600(); // and INC101061, Test move files from internal drive to external with system
+					 // 			   and hidden attributes
 	}
 //
 // A complex test directory structure...
 LOCAL_C void TestRecursiveMoveAcrossDrives()
 //
 // Test recursive move across drives
 //
 	{
 	test.Next(_L("Test recursive move across drives"));
 	TFileName trgDir   = _L("\\F32-TST\\TFMAN\\RECMOVE2\\");
 	TFileName trgSpec  = _L("\\F32-TST\\TFMAN\\RECMOVE2\\*");
 	if (gSessionPath[0]=='C')
 		{
 #if !defined(__WINS__)
 		trgDir	   = _L("D:\\F32-TST\\TFMAN\\RECMOVE2\\");
 	TInt err;
 	if (!gAsynch)
 		err=gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\RECMOVE\\*.PLP"),trgDir,CFileMan::ERecurse);
 	else
 		err=gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\RECMOVE\\*.PLP"),trgDir,CFileMan::ERecurse,gStat);
+	test.Printf(_L("TestRecursiveMoveAcrossDrives(),gFileMan->Move(),err=%d\n"),err);
 	TestResult(err);
 	RmDir(_L("C:\\F32-TST\\TFMAN\\after\\"));
 	MakeFile(_L("C:\\F32-TST\\TFMAN\\AFTER\\FULL\\FILE2.PLP"));
 	MakeFile(_L("C:\\F32-TST\\TFMAN\\AFTER\\FULL\\FILE3.PLP"));
 	//---------------------------------------------
 	//! @SYMTestCaseID			PBASE-T_FMAN-0571
 	//! @SYMTestType			UT
 	//! @SYMREQ					INC108401
-	//! @SYMTestCaseDesc		This testcase tests the synchronous and asynchronous move operations exhaustively with flags set as 0, CFileMan::EOverWrite,
+	//! @SYMTestCaseDesc		This testcase tests the synchronous and asynchronous move operations
-	//!							CFileMan::ERecurse on the SAME and ACROSS drives without trailing slash at the end of source dir path.
+	//!							exhaustively with flags set as 0, CFileMan::EOverWrite, CFileMan::ERecurse
+	//!							on the SAME and ACROSS drives without trailing slash at the end of source
+	//!							dir path.
 	//! @SYMTestActions			1. Copy directory structures to another directory across drive.
-	//! 						2. Copy directory structures to another directory across drive overwriting duplicate files.
+	//! 						2. Copy directory structures to another directory across drive overwriting
+	//!							   duplicate files.
 	//! 						3. Copy directory structures to another directory across drive.
 	//! 						4. Copy directory structures to another directory on same drive.
-	//! 						5. Copy directory structures to another directory on same drive overwriting duplicate files.
+	//! 						5. Copy directory structures to another directory on same drive overwriting
+	//!							   duplicate files.
 	//! 						6. Copy directory structures to another directory on same drive.
-	//! @SYMTestExpectedResults 1. Completes with no error, the last directory and its contents are moved from the src directory to the destination directory.
+	//! @SYMTestExpectedResults 1. Completes with no error, the last directory and its contents are moved
-	//!							2. Completes with no error, the last directory and its contents are moved from the src directory to the destination directory, duplicate files are updated.
+	//!							   from the src directory to the destination directory.
-	//!							3. Completes with no error, the last directory and its contents are moved from the src directory to the destination directory.
+	//!							2. Completes with no error, the last directory and its contents are moved
-	//!							4. Completes with no error, the last directory and its contents are moved from the src directory to the destination directory.
+	//!							   from the src directory to the destination directory, duplicate files are updated.
-	//!							5. Completes with no error, the last directory and its contents are moved from the src directory to the destination directory, duplicate files are updated.
+	//!							3. Completes with no error, the last directory and its contents are moved
-	//!							6. Completes with no error, the last directory and its contents are moved from the src directory to the destination directory.
+	//!							   from the src directory to the destination directory.
+	//!							4. Completes with no error, the last directory and its contents are moved
+	//!							   from the src directory to the destination directory.
+	//!							5. Completes with no error, the last directory and its contents are moved
+	//!							   from the src directory to the destination directory, duplicate files are updated.
+	//!							6. Completes with no error, the last directory and its contents are moved
+	//!							   from the src directory to the destination directory.
 	//! @SYMTestPriority		High
 	//! @SYMTestStatus			Implemented
 	//---------------------------------------------
 	TestINC108401();
 CFileManCopyAllCancel::CFileManCopyAllCancel(CFileMan* aFileMan)
 //
 // Constructor
 //
 	{
 	__DECLARE_NAME(_S("CFileManCopyAllCancel"));
 	iFileMan=aFileMan;
 	}
 MFileManObserver::TControl CFileManCopyAllCancel::NotifyFileManStarted()
 //
 // Observer for TestCopyAllCancel tests
 //
 	{
 	return(MFileManObserver::ECancel);
 	}
 MFileManObserver::TControl CFileManCopyAllCancel::NotifyFileManEnded()
 //
 // Observer for TestCopyAllCancel tests
 //
 	{
 	return(MFileManObserver::EContinue);
 	}
 LOCAL_C void TestCopyAllCancel()
 //
-// Test copy ( all cancel)
+// Test copy (all cancel)
 //
 	{
 	test.Next(_L("Test copy all cancel"));
 	RmDir(_L("\\F32-TST\\TFMAN\\COPYDIR\\*"));
 	CFileManCopyAllCancel* fManObserver=new(ELeave) CFileManCopyAllCancel(gFileMan);
 	CleanupStack::PushL(fManObserver);
 	gFileMan->SetObserver(fManObserver);
 	MakeDir(_L("\\F32-TST\\TFMAN\\COPYDIR\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\DELDIR\\DELTEST\\EMPTY\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\NewDir\\ABC.DEF"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\DELDIR\\FILE1.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\DELDIR\\FILE2.TXT"));
 	else
 		r=gFileMan->Copy(_L("\\F32-TST\\TFMAN\\DELDIR\\FILE1.txt"),_L("\\F32-TST\\TFMAN\\file1.txt"),0,gStat);
 	TestResult(r,KErrCancel);
 	gFileMan->SetObserver(gObserver);
 	CleanupStack::PopAndDestroy();
 	}
 class CFileManObserverOverWrite : public CBase, public MFileManObserver
 	{
 public:
 CFileManObserverOverWrite::CFileManObserverOverWrite(CFileMan* aFileMan)
 //
 // Constructor
 //
 	{
 	__DECLARE_NAME(_S("CFileManObserverOverWrite"));
 	iFileMan=aFileMan;
 	}
 MFileManObserver::TControl CFileManObserverOverWrite::NotifyFileManEnded()
 //
 // Observer for testoverwrite tests
 //
 	{
 	TInt lastError=iFileMan->GetLastError();
 	if (lastError!=KErrNone)
 		{
 		test(lastError==KErrAlreadyExists);
 		if (gAsynch==EFalse)
 LOCAL_C void TestOverWrite()
 //
 // Test overwrite for copy and rename
 //
 	{
 	test.Next(_L("Test overwrite option"));
 	RmDir(_L("\\F32-TST\\TFMAN\\OVERWRITE\\"));
 	CFileManObserverOverWrite* fManObserver=new(ELeave) CFileManObserverOverWrite(gFileMan);
 	CleanupStack::PushL(fManObserver);
 	gFileMan->SetObserver(fManObserver);
 LOCAL_C void TestErrorHandling()
 //
 // Test bad paths etc
 //
 	{
 	test.Next(_L("Test error handling"));
 	if (!gAsynch)
 		{
 		TInt r=gFileMan->Delete(_L("\\F32-TST\\TFMAN\\BADPATH\\*"));
 		test(r==KErrPathNotFound);
 	RmDir(_L("\\EMPTYSRC\\"));
 	RmDir(_L("\\EMPTYTRG\\"));
 	MakeFile(_L("Dummyfile"));
-	test.Next(_L("Illegal names"));
+	test.Next(_L("Test illegal names"));
 	r=gFileMan->Attribs(_L(":C:"),0,0,TTime(0),0);
 	test(r==KErrBadName);
 	r=gFileMan->Copy(_L(":C:"),_L("newname"),0);
 	test(r==KErrBadName);
 	r=gFileMan->Copy(_L("Dummyfile"),_L(":C:"),0);
 LOCAL_C void TestNameMangling()
 //
 // Synchronous test of name mangling
 //
 	{
+	test.Next(_L("Test name mangling"));
 	gFileMan->RmDir(_L("\\F32-TST\\TFMAN\\NAMEMANGLER\\TRG\\"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\NAMEMANGLER\\TRG\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\NAMEMANGLER\\SRC\\abc.def"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\NAMEMANGLER\\SRC\\abcdefghijk.def"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\NAMEMANGLER\\SRC\\abc.defgh"));
 	r=gFileMan->RmDir(longRootDirNameB);
 	test(r==KErrPathNotFound);
 	r=gFileMan->RmDir(longRootDirNameA);
 	test(r==KErrNone);
 	TFileName longSubDirName=_L("\\Files\\");
 	TPtrC longSubDirFileName(longFileNameA.Ptr(),longFilePtrLength-longSubDirName.Length());
 	longSubDirName+=longSubDirFileName;
 	longSubDirName+=_L("\\");
 	r=TheFs.MkDirAll(longSubDirName);
 	r=TheFs.GetDir(longSubDirName,KEntryAttMaskSupported,0,dirList);
 	test(r==KErrNone);
 	test(dirList->Count()==0);
 	delete dirList;
 	TPtrC ptrLongSubDirSrc(longSubDirName.Ptr(),longSubDirName.Length()-1);
 	TPtrC ptrLongSubDirTrg(longRootDirNameA.Ptr(),longRootDirNameA.Length()-1);
 	r=gFileMan->Copy(ptrLongSubDirSrc,ptrLongSubDirTrg);
 	test(r==KErrNone);
 	r=TheFs.MkDir(longRootDirNameB);
 LOCAL_C void TestFileAttributes()
 //
 // Test file attributes are copied and new settings
 //
 	{
+	test.Next(_L("Test file attributes are copied"));
 	gFileMan->Delete(_L("\\F32-TST\\TFMAN\\FILEATT\\TRG\\*.*"));
 	MakeDir(_L("\\F32-TST\\TFMAN\\FILEATT\\TRG\\"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\FILEATT\\SRC\\readonly.def"),KEntryAttReadOnly);
 	MakeFile(_L("\\F32-TST\\TFMAN\\FILEATT\\SRC\\readonlyhidden.def"),KEntryAttReadOnly|KEntryAttHidden);
 	MakeFile(_L("\\F32-TST\\TFMAN\\FILEATT\\SRC\\hiddensystem.def"),KEntryAttHidden|KEntryAttSystem);
 CFileManObserverContinue::CFileManObserverContinue(CFileMan* aFileMan)
 //
 // Constructor
 //
 	{
 	__DECLARE_NAME(_S("CFileManObserverOverWrite"));
 	iFileMan=aFileMan;
 	}
 MFileManObserver::TControl CFileManObserverContinue::NotifyFileManEnded()
 //
 // Observer for testoverwrite tests
 //
 	{
 	return(MFileManObserver::EContinue);
 	}
 LOCAL_C void TestCopyOpenFile()
 //
 // Copy a file while it is open
 //
 	{
+	test.Next(_L("Test copying open files"));
-	test.Next(_L("Copying open files"));
 	CFileManObserverContinue* fManObserver=new(ELeave) CFileManObserverContinue(gFileMan);
 	gFileMan->SetObserver(fManObserver);
 	TBuf<256> contents;
 	delete fManObserver;
 	}
 void TestINC101844()
 	{
+	test.Next(_L("Test move files and subdirs with different attributes (INC101844)"));
 	_LIT(KDest,"C:\\DEST101844\\");
 	TBuf<64> source;
 	source.Format(_L("%c:\\INC101844\\"), (TUint) gDriveToTest);
 	TBuf<64> src;
 	RmDir(source);
 	RmDir(KDest);
 	MakeDir(KDest);
 	TInt r;
+	// Create files and subdirs with different attributes
 	src = source;
 	src.Append(_L("file1"));
 	MakeFile(src, _L8("blah"));
 	TheFs.SetAtt(src, KEntryAttReadOnly, 0);
 	src = source;
 	TheFs.SetAtt(src, KEntryAttArchive, 0);
 	src = source;
 	src.Append(_L("subdir1"));
 	TheFs.SetAtt(src, KEntryAttSystem | KEntryAttHidden, KEntryAttArchive);
+	// Move directory containing files and subdirs with different attributes
 	r = gFileMan->Move(source, KDest, 0);
 	test(r==KErrNone);
+	// Check that the files and subdirs have moved and have the correct attributes
 	TEntry entry;
 	src = KDest;
 	src.Append(_L("file1"));
 	r = TheFs.Entry(src, entry);
 	test(r == KErrNone);
 LOCAL_C void TestMoveAcrossDrives()
 //
 // Move a file from C: to the target drive
 //
 	{
+	test.Next(_L("Test move across drives"));
-	test.Next(_L("Move across drives"));
 	TFileName trgDrive   = _L("\\");
 	TFileName trgFile    = _L("\\Sketch");
 	TFileName trgDir     = _L("\\DRIVEMOVE\\");
 	TFileName trgDirFile = _L("\\DRIVEMOVE\\Sketch");
 	RmDir(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\"));
 	MakeFile(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\Sketch"));
 	// Move Sketch from the source to target
-	gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\Sketch"),trgDrive);
+	TInt r = gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\Sketch"),trgDrive);
+	test.Printf(_L("TestMoveAcrossDrives(),gFileMan->Move(),r=%d\n"),r);
 	// Check Sketch no longer exists on source drive
 	CheckFileExists(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\Sketch"),KErrNotFound);
 	// Check Sketch exists on target drive
 	CheckFileExists(trgFile,KErrNone);
 	MakeFile(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\Sketch"));
 	// Move Directory DRIVEMOVE from the source to target
-	gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE"),trgDrive);
+	r = gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE"),trgDrive);
+	test.Printf(_L("TestMoveAcrossDrives(),gFileMan->Move(),r=%d\n"),r);
 	// Check DRIVEMOVE no longer exists on source drive
 	CheckFileExists(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\Sketch"),KErrPathNotFound);
 	// Check Sketch exists on target drive
 	CheckFileExists(trgDirFile,KErrNone);
 	RmDir(trgDir);
 	test(TheFs.Delete(trgFile) == KErrNone);
-	TestINC101844();
+	TestINC101844(); // Test move files and subdirs with different attributes
 	}
 class CFileManObserverCopyAbort : public CBase, public MFileManObserver
 	{
 public:
 MFileManObserver::TControl CFileManObserverCopyAbort::NotifyFileManEnded()
 //
 // Observer for testoverwrite tests
 //
 	{
 	TInt lastError = iFileMan->GetLastError();
 	test(lastError == KErrNone);
 	TFileName srcfile;
 	iFileMan->GetCurrentSource(srcfile);
 	return(iCurrentStep ? MFileManObserver::EContinue : MFileManObserver::EAbort);
 	}
 LOCAL_C void TestAbortedMoveAcrossDrives()
 //
-// Move a file from C: to Y:, and test various cancel conditions
+// Move a file from C: to D: or Y:, and test various cancel conditions
 //
 	{
+	test.Next(_L("Test cancel move across drives"));
-	test.Next(_L("Cancel Move across drives"));
 	const TInt KNumFiles = 5;
 	TFileName trgDirRoot = _L("\\F32-TST\\TFMAN\\");
 	TFileName trgDirFull = _L("\\F32-TST\\TFMAN\\CANCELMOVE\\");
 	gFileMan->RmDir(_L("C:\\F32-TST\\TFMAN\\CANCELMOVE\\"));
 	CFileManObserverCopyAbort* fManObserver=new(ELeave) CFileManObserverCopyAbort(gFileMan);
 	CleanupStack::PushL(fManObserver);
-// Check that source files exist when interrupting the copy step
+	// Check that source files exist when interrupting the copy step
 	TInt step = 0;
 	TInt i = 0;
 	for(step = 1; step <= KNumFiles+1; ++step)
 		{
 		for (i = 0; i < KNumFiles; i++)
 		if (!gAsynch)
 			r=gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\CANCELMOVE"),trgDirRoot, CFileMan::EOverWrite);
 		else
 			r=gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\CANCELMOVE"),trgDirRoot, CFileMan::EOverWrite, gStat);
+		test.Printf(_L("TestAbortedMoveAcrossDrives(),gFileMan->Move(),r=%d\n"),r);
 		TestResult(r, (step <= KNumFiles) ? KErrCancel : KErrNone);
 		gFileMan->SetObserver(NULL);
 		// Check that the expected target files exist...
 LOCAL_C void TestMoveEmptyDirectory()
 //
 //	"Try to move an empty directory C:\F32-TST\TFMAN\DRIVEMOVE\ to C:\"
 //
 	{
+	test.Next(_L("Test move empty directory"));
-	test.Next(_L("Move empty directory"));
 #if !defined(__WINS__)
 	TFileName trgDrive=_L("D:\\");
 #else
 	if (gSessionPath[0]!='C')
 	TFileName trgDrive=_L("C:\\");
 #endif
 	MakeDir(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\"));
 	TInt r=gFileMan->Move(_L("C:\\F32-TST\\TFMAN\\DRIVEMOVE\\*"),trgDrive,CFileMan::ERecurse);
+	test.Printf(_L("TestMoveEmptyDirectory(),gFileMan->Move(),r=%d\n"),r);
 	test (r==KErrNotFound);
 	}
 LOCAL_C void TestCopyAndRename()
 //
 // Rename while copying files and directories
 //
 	{
-	test.Next(_L("Rename while copying files and directories"));
+	test.Next(_L("Test rename while copying files and directories"));
 	gFileMan->RmDir(_L("\\F32-TST\\TFMAN\\CPMV"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\CPMV\\ONE\\ONE_1.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\CPMV\\ONE\\ONE_2.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\CPMV\\ONE\\ONE_3.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\CPMV\\ONE\\TWOTWO.TWO"));
 	test(r==KErrNone);
 	MakeFile(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2\\TWO__1.TXT"));
 	MakeFile(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2\\TWO__2.TXT"));
-// copy and rename dir
+	// copy and rename dir
 	r=gFileMan->Copy(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2"), _L("\\F32-TST\\TFMAN\\CPMV\\THREE"), CFileMan::ERecurse);
 	test(r==KErrNone);
 	Compare(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2\\*"), _L("\\F32-TST\\TFMAN\\CPMV\\THREE\\*"));
-// copy and move into another dir
+	// copy and move into another dir
 	r=gFileMan->Copy(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2"), _L("\\F32-TST\\TFMAN\\CPMV\\THREE\\TWO"), CFileMan::ERecurse);
 	test(r==KErrNone);
 	Compare(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2\\*"), _L("\\F32-TST\\TFMAN\\CPMV\\THREE\\TWO\\*"));
-// copy and rename files and dirs in current dir
+	// copy and rename files and dirs in current dir
 	r=gFileMan->Copy(_L("\\F32-TST\\TFMAN\\CPMV\\TWO*"), _L("\\F32-TST\\TFMAN\\CPMV\\THREE*"), CFileMan::ERecurse);
 	test(r==KErrNone);
-//	Compare(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2\\*"), _L("\\F32-TST\\TFMAN\\CPMV\\THREE2\\*"));
+	//	Compare(_L("\\F32-TST\\TFMAN\\CPMV\\TWO2\\*"), _L("\\F32-TST\\TFMAN\\CPMV\\THREE2\\*"));
 	CheckFileExists(_L("\\F32-TST\\TFMAN\\CPMV\\ONE\\THREEO.TWO"), KErrNone);
 	CheckFileExists(_L("\\F32-TST\\TFMAN\\CPMV\\THREE\\TWO__1.TXT"), KErrNone);
 	CheckFileExists(_L("\\F32-TST\\TFMAN\\CPMV\\THREE\\TWO__2.TXT"), KErrNone);
 	CheckFileExists(_L("\\F32-TST\\TFMAN\\CPMV\\THREE.TXT"), KErrNone);
 LOCAL_C void InitialiseL()
 //
 // Set up test variables
 //
 	{
 	gFileMan=CFileMan::NewL(TheFs);
 	gObserver=new(ELeave) CFileManObserver(gFileMan);
 	gFileMan->SetObserver(gObserver);
 	}
 LOCAL_C void Cleanup()
 //
 // Cleanup test variables
 //
 	{
 	delete gFileMan;
 	delete gObserver;
 	}
 LOCAL_C void SetupDirStructure(TFileName& aSrcPath,TFileName& aTrgPath)
 	MakeFile(tmpName);
 	}
 LOCAL_C void TestPDEF112148()
 	{
-	test.Next(_L("++TestPDEF112148 : \n"));
+	test.Next(_L("Test recursive and non-recursive move across drives (PDEF112148)"));
 	TInt err = 0;
 	TFileName trgPath;
 	trgPath.Format(_L("%c:\\F32-TST\\TFMAN\\PDEF112148\\dest\\"), (TUint8)gDriveToTest);
 	delete dir;
 	// clean up before leaving
 	RmDir(srcPath);
 	RmDir(trgPath);
-	test.Next(_L("--TestPDEF112148 : \n"));
 	}
 //---------------------------------------------
 //! @SYMTestCaseID			PBASE-T_FMAN-2398
 //! @SYMTestType			UT
 //! @SYMREQ					DEF130678
 //! @SYMTestExpectedResults	Test completes without any crash and hence without any memory leak.
 //! @SYMTestPriority		High
 //! @SYMTestStatus			Implemented
 //---------------------------------------------
 void TestDEF130678()
-{
+	{
-	test.Next(_L("++TestDEF130678\n"));
+	test.Next(_L("Test CFileMan::Move does not leak any memory"));
 	_LIT(KFromFile,"C:\\TestDEF130678\\FROM\\from_");
 	_LIT(KToFile,"C:\\TestDEF130678\\TO\\");
 	TInt run;
 	// choose a number that certainly tests all memory allocations.
 		__UHEAP_RESET;
 		__UHEAP_MARKEND;
 		} // End of OOM loop
 	// cleanup
 	RmDir(_L("C:\\TestDEF130678\\"));
-	test.Next(_L("--TestDEF130678\n"));
+	}
-}
 GLDEF_C void CallTestsL()
 //
 // Do tests
 //
 	CreateTestDirectory(_L("\\F32-TST\\TFMAN\\"));
 //	May not be able to test handling of invalid path lengths because F32 fix
 //	to prevent paths >256 ever being created
 	testingInvalidPathLengths = CheckIfShortPathsAreSupported();
+	//-----------------------------------------------------------------------------------
+	// Asynchronous tests
+	//
 	gAsynch=ETrue;
 	test.Next(_L("Asynchronous tests ..."));
 	TheFs.SetAllocFailure(gAllocFailOff);
 	TInt uid;
 	test(HAL::Get(HAL::EMachineUid,uid)==KErrNone);
 		{
 		TestMoveAcrossDrives();
 		TestRecursiveMoveAcrossDrives();
 		TestMoveEmptyDirectory();
 		TestAbortedMoveAcrossDrives();
-		TestPDEF112148();
+		TestPDEF112148(); // Test recursive and non-recursive move across drives
 		}
 	TestOverWrite();
 	TestRename();
 	TestErrorHandling();
 	if (!IsTestingLFFS())
 		TestCopy(); // ???
 	TestMove();
 	TestCopyAllCancel();
+	//-----------------------------------------------------------------------------------
+	// Synchronous tests
+	//
 	gAsynch=EFalse;
 	test.Next(_L("Synchronous tests ..."));
 	TheFs.SetAllocFailure(gAllocFailOn);
 	if (doTargetTests)
 		{
 		TestMoveAcrossDrives();
 		TestRecursiveMoveAcrossDrives();
 		TestMoveEmptyDirectory();
 		TestAbortedMoveAcrossDrives();
-		TestPDEF112148();
+		TestPDEF112148(); // Test recursive and non-recursive move across drives
 		}
 	TestCopyOpenFile();
 	if(testingInvalidPathLengths)
 		TestLongNames();
 	TestCopy();
 	TestMove();
 	TestCopyAndRename();
 	TestCopyAllCancel();
-	// OOM testing
+	TestDEF130678(); // Test CFileMan::Move does not leak any memory
-	TestDEF130678();
 #ifndef __WINS__
 	RThread t;
 	TThreadStackInfo stack;
 	test(t.StackInfo(stack)==KErrNone);
 	TestStackUsage(0, stack);

changeset 31	56f325a607ea
parent 0	a41df078684a
child 80	597aaf25e343