diff -r 000000000000 -r e4d67989cc36 genericservices/httputils/Test/Integration/TestFileUriSuite/TestFileUriSuite.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/genericservices/httputils/Test/Integration/TestFileUriSuite/TestFileUriSuite.ini	Tue Feb 02 02:01:42 2010 +0200
@@ -0,0 +1,702 @@
+//Ini file for running FileURI Tests
+
+[CreateUri_Internal_Public_8]
+filename		=	C:\dir\file.txt
+expectedfileuri		=	file:///C/dir/file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Internal_Public_16]
+filename		=	C:\dir\file.txt
+expectedfileuri		=	file:///C/dir/file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Removable_PublicX_8]
+filename		=	x:\data\file.txt
+expectedfileuri		=	file:///<drive>/data/file.txt
+drive			=	x
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Removable_PublicD_8]
+filename		=	d:\data\file.txt
+expectedfileuri		=	file:///<drive>/data/file.txt
+drive			=	d
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Removable_PublicE_8]
+filename		=	e:\data\file.txt
+expectedfileuri		=	file:///<drive>/data/file.txt
+drive			=	e
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Removable_PublicX_16]
+filename		=	x:\data\file.txt
+expectedfileuri		=	file:///<drive>/data/file.txt
+drive			=	x
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Removable_PublicD_16]
+filename		=	d:\data\file.txt
+expectedfileuri		=	file:///<drive>/data/file.txt
+drive			=	d
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Removable_PublicE_16]
+filename		=	e:\data\file.txt
+expectedfileuri		=	file:///<drive>/data/file.txt
+drive			=	e
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Internal_Private_Relative_8_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	c
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Internal_Private_Relative_8_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	c
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Internal_Private_Relative_8_3]
+filename		=	c:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	c
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Internal_Private_FullPath_8]
+filename		=	c:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Internal_Private_Relative_16_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	c
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Internal_Private_Relative_16_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	c
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Internal_Private_Relative_16_3]
+filename		=	c:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	c
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Internal_Private_FullPath_16]
+filename		=	c:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeX_8_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	x
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeD_8_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	d
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeE_8_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	e
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeX_8_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	x
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeD_8_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	d
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeE_8_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	e
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeX_8_3]
+filename		=	x:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	x
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeD_8_3]
+filename		=	d:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	d
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeE_8_3]
+filename		=	e:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	e
+filetype		=	private
+characterset		=	8
+
+[CreateUri_Removable_Private_FullPathX_8]
+filename		=	x:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	x
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Removable_Private_FullPathD_8]
+filename		=	d:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	d
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Removable_Private_FullPathE_8]
+filename		=	e:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	e
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Removable_Private_RelativeX_16_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	x
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeD_16_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	d
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeE_16_1]
+filename		=	\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	e
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeX_16_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	x
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeD_16_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	d
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeE_16_2]
+filename		=	data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	e
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeX_16_3]
+filename		=	x:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	x
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeD_16_3]
+filename		=	d:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	d
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_RelativeE_16_3]
+filename		=	e:\data\file.txt
+expectedfileuri		=	file:///private/<drive>/data/file.txt
+drive			=	e
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Removable_Private_FullPathX_16]
+filename		=	x:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	x
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Removable_Private_FullPathD_16]
+filename		=	d:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	d
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Removable_Private_FullPathE_16]
+filename		=	e:\private\00000001\data\file.txt
+expectedfileuri		=	file:///<drive>/private/00000001/data/file.txt
+drive			=	e
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Internal_Public_8]
+fileuri			=	file:///Z/test/file.ini
+expectedfilename	=	z:\test\file.ini
+drive			=	z
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Internal_Public_16]
+fileuri			=	file:///Z/test/file.ini
+expectedfilename	=	z:\test\file.ini
+drive			=	z
+filetype		=	public
+characterset		=	16
+
+[Removable_Public_FileX]
+filename		=	X:\test\file.ini
+
+[Removable_Public_FileD]
+filename		=	d:\test\file.ini
+
+[Removable_Public_FileE]
+filename		=	e:\test\file.ini
+
+[GetFileName_Removable_PublicX_8]
+fileuri			=	file:///<drive>/test/file.ini
+expectedfilename	=	X:\test\file.ini
+drive			=	x
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Removable_PublicD_8]
+fileuri			=	file:///<drive>/test/file.ini
+expectedfilename	=	d:\test\file.ini
+drive			=	d
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Removable_PublicE_8]
+fileuri			=	file:///<drive>/test/file.ini
+expectedfilename	=	e:\test\file.ini
+drive			=	e
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Removable_PublicX_16]
+fileuri			=	file:///<drive>/test/file.ini
+expectedfilename	=	x:\test\file.ini
+drive			=	x
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Removable_PublicD_16]
+fileuri			=	file:///<drive>/test/file.ini
+expectedfilename	=	d:\test\file.ini
+drive			=	d
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Removable_PublicE_16]
+fileuri			=	file:///<drive>/test/file.ini
+expectedfilename	=	e:\test\file.ini
+drive			=	e
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Internal_Private_8]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	c
+filetype		=	private
+characterset		=	8
+
+[GetFileName_Internal_Private_16]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	c
+filetype		=	private
+characterset		=	16
+
+[Removable_Private_FileX]
+filename		=	test\file.ini
+filetype		=	private
+drive			=	x
+
+[Removable_Private_FileD]
+filename		=	test\file.ini
+filetype		=	private
+drive			=	d
+
+[Removable_Private_FileE]
+filename		=	test\file.ini
+filetype		=	private
+drive			=	e
+
+[GetFileName_Removable_PrivateX_8]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	x
+filetype		=	private
+characterset		=	8
+
+[GetFileName_Removable_PrivateD_8]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	d
+filetype		=	private
+characterset		=	8
+
+[GetFileName_Removable_PrivateE_8]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	e
+filetype		=	private
+characterset		=	8
+
+[GetFileName_Removable_PrivateX_16]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	x
+filetype		=	private
+characterset		=	16
+
+[GetFileName_Removable_PrivateD_16]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	d
+filetype		=	private
+characterset		=	16
+
+[GetFileName_Removable_PrivateE_16]
+fileuri			=	file:///private/<drive>/test/file.ini
+expectedfilename	=	test\file.ini
+drive			=	e
+filetype		=	private
+characterset		=	16
+
+[CreateUri_Unusual1_8]
+filename		=	C:\c\façade.txt
+expectedfileuri		=	file:///C/c/fa%c3%a7ade.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Unusual1_16]
+filename		=	C:\c\façade.txt
+expectedfileuri		=	file:///C/c/fa%c3%a7ade.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Unusual2_8]
+filename		=	C:\private\file
+expectedfileuri		=	file:///C/private/file
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Unusual2_16]
+filename		=	C:\private\file
+expectedfileuri		=	file:///C/private/file
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual1_8]
+fileuri			=	file:///c/un-private/dir/file.txt
+expectedfilename	=	c:\un-private\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual1_16]
+fileuri			=	file:///c/un-private/dir/file.txt
+expectedfilename	=	c:\un-private\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual2_8]
+fileuri			=	file:///c/text-media/dir/file.txt
+expectedfilename	=	c:\text-media\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual2_16]
+fileuri			=	file:///c/text-media/dir/file.txt
+expectedfilename	=	c:\text-media\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual3_8]
+fileuri			=	file:///d/ext-media/file.txt
+expectedfilename	=	d:\ext-media\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual3_16]
+fileuri			=	file:///d/ext-media/file.txt
+expectedfilename	=	d:\ext-media\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual4_8]
+fileuri			=	file:///c/private/file.txt
+expectedfilename	=	c:\private\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual4_16]
+fileuri			=	file:///c/private/file.txt
+expectedfilename	=	c:\private\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual5_8]
+fileuri			=	file:///C/c/fa%c3%a7ade.txt
+expectedfilename	=	C:\c\façade.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual5_16]
+fileuri			=	file:///C/c/fa%c3%a7ade.txt
+expectedfilename	=	C:\c\façade.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual6_8]
+fileuri			=	file:///c/ext-media1/dir/file.txt
+expectedfilename	=	c:\ext-media1\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual6_16]
+fileuri			=	file:///c/ext-media1/dir/file.txt
+expectedfilename	=	c:\ext-media1\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual7_8]
+fileuri			=	file:///c/private1/dir/file.txt
+expectedfilename	=	c:\private1\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual7_16]
+fileuri			=	file:///c/private1/dir/file.txt
+expectedfilename	=	c:\private1\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[File_Unusual_X]
+filename		=	X:\private\file.txt
+
+[File_Unusual_D]
+filename		=	D:\private\file.txt
+
+[File_Unusual_E]
+filename		=	E:\private\file.txt
+
+[GetFileName_Unusual8_X_8]
+fileuri			=	file:///<drive>/private/file.txt
+expectedfilename	=	x:\private\file.txt
+drive			=	x
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual8_X_16]
+fileuri			=	file:///<drive>/private/file.txt
+expectedfilename	=	x:\private\file.txt
+drive			=	x
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual8_D_8]
+fileuri			=	file:///<drive>/private/file.txt
+expectedfilename	=	d:\private\file.txt
+drive			=	d
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual8_D_16]
+fileuri			=	file:///<drive>/private/file.txt
+expectedfilename	=	d:\private\file.txt
+drive			=	d
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Unusual8_E_8]
+fileuri			=	file:///<drive>/private/file.txt
+expectedfilename	=	e:\private\file.txt
+drive			=	e
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Unusual8_E_16]
+fileuri			=	file:///<drive>/private/file.txt
+expectedfilename	=	e:\private\file.txt
+drive			=	e
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Bad1_8]
+filename		=	C\dir\myfile.txt
+expectedfileuri		=	file:///C/dir/myfile.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Bad1_16]
+filename		=	C\dir\myfile.txt
+expectedfileuri		=	file:///C/dir/myfile.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Bad2_8]
+filename		=	Myfile\C:\dir.txt
+expectedfileuri		=	file:///Myfile/C:/dir.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Bad2_16]
+filename		=	Myfile\C:\dir.txt
+expectedfileuri		=	file:///Myfile/C:/dir.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[CreateUri_Bad5_8]
+filename		=	3:\dir\file.txt
+expectedfileuri		=	file:///3/dir/file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[CreateUri_Bad5_16]
+filename		=	3:\dir\file.txt
+expectedfileuri		=	file:///3/dir/file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[GetFileName_Bad5_8]
+fileuri			=	file://\C/dir\file.txt
+expectedfilename	=	C:\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	8
+
+[GetFileName_Bad5_16]
+fileuri			=	file:/\/C/dir\file.txt
+expectedfilename	=	C:\dir\file.txt
+drive			=	c
+filetype		=	public
+characterset		=	16
+
+[FileDoesNotExistOnX]
+filename		=	X:\test\file.txt
+
+[FileDoesNotExistOnD]
+filename		=	D:\test\file.txt
+
+[FileDoesNotExistOnE]
+filename		=	E:\test\file.txt
+
+
+[GetFileName_On_X_8]
+fileuri			=	file:///<drive>/test/file.txt
+expectedfilename	=	x:\test\file.txt
+drive			=	x
+filetype		=	public
+characterset		=	8
+
+[GetFileName_On_X_16]
+fileuri			=	file:///<drive>/test/file.txt
+expectedfilename	=	x:\test\file.txt
+drive			=	x
+filetype		=	public
+characterset		=	16
+
+[GetFileName_On_D_8]
+fileuri			=	file:///<drive>/test/file.txt
+expectedfilename	=	d:\test\file.txt
+drive			=	d
+filetype		=	public
+characterset		=	8
+
+[GetFileName_On_D_16]
+fileuri			=	file:///<drive>/test/file.txt
+expectedfilename	=	d:\test\file.txt
+drive			=	d
+filetype		=	public
+characterset		=	16
+
+[GetFileName_On_E_8]
+fileuri			=	file:///<drive>/test/file.txt
+expectedfilename	=	e:\test\file.txt
+drive			=	e
+filetype		=	public
+characterset		=	8
+
+[GetFileName_On_E_16]
+fileuri			=	file:///<drive>/test/file.txt
+expectedfilename	=	e:\test\file.txt
+drive			=	e
+filetype		=	public
+characterset		=	16