2004-06-11 Atsushi Enomoto <atsushi@ximian.com>

	* test-uri-list.txt,
	  test-uri-props.txt,
	  test-uri-props-manual.txt :
	  Reverted the last change. File URI handling should be common to
	  MS.NET. We have to change the behavior only for Unix file path.
	* UriTest2.cs : Fixed just catch only UriFormatException.

svn path=/trunk/mcs/; revision=29296

diff --git a/mcs/class/System/Test/System/ChangeLog b/mcs/class/System/Test/System/ChangeLog
index 95b63d61d4213743ba811037452b6bc7dc6fa47f..c6beda0447160c8298d889271ec2b746c7ed80d1 100644 (file)
--- a/mcs/class/System/Test/System/ChangeLog
+++ b/mcs/class/System/Test/System/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-11  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * test-uri-list.txt,
+         test-uri-props.txt,
+         test-uri-props-manual.txt :
+         Reverted the last change. File URI handling should be common to 
+         MS.NET. We have to change the behavior only for Unix file path.
+       * UriTest2.cs : Fixed just catch only UriFormatException.
+
 2004-06-10  Atsushi Enomoto  <atsushi@ximian.com>
 
        * UriTest.cs : Should not expect exception for Unix file path.

diff --git a/mcs/class/System/Test/System/UriTest2.cs b/mcs/class/System/Test/System/UriTest2.cs
index 0ee81b11dc30c55477068a62bc3b591dcc33658e..1878ca87a3e5f7f42f8cddb117e995ca95963cf3 100755 (executable)
--- a/mcs/class/System/Test/System/UriTest2.cs
+++ b/mcs/class/System/Test/System/UriTest2.cs
@@ -119,7 +119,7 @@ TextWriter sw = Console.Out;
                                                sr.ReadLine (),\r
                                                sr.ReadLine ());\r
 //                             Console.WriteLine ("Passed: " + uriString);\r
-                               } catch (Exception ex) {\r
+                               } catch (UriFormatException ex) {\r
                                        Fail (String.Format ("Construction failed: [{0}] {1}", uriString, ex.Message));\r
                                }\r
                        }\r

diff --git a/mcs/class/System/Test/System/test-uri-list.txt b/mcs/class/System/Test/System/test-uri-list.txt
index 45c07c2dbe36012488c57c3ed9316436658413d7..339644a944b6a632c178e2e3ac78e9805accae2e 100755 (executable)
--- a/mcs/class/System/Test/System/test-uri-list.txt
+++ b/mcs/class/System/Test/System/test-uri-list.txt
@@ -90,6 +90,9 @@ file:///c:/name%20with%20space.txt
 # Below should be allowed
 http://localhost/c#
 http://localhost/c#bookmark
+file://localhost/c#fragment
+file://test.domain.com/c#
+file://test.domain.com/c#bookmark
 //localhost/c#
 # below should not be allowed ...
 file://c:/c#

diff --git a/mcs/class/System/Test/System/test-uri-props-manual.txt b/mcs/class/System/Test/System/test-uri-props-manual.txt
index 9910d6ce402406fac8d0804ffa08c296e9acf401..5c26f786c273a2f376ec8c2d76d1c0dca2eaf9c5 100755 (executable)
--- a/mcs/class/System/Test/System/test-uri-props-manual.txt
+++ b/mcs/class/System/Test/System/test-uri-props-manual.txt
@@ -1,42 +1,4 @@
-------------------------- localhost should not be \\localhost\c. No fragment.\r
-file://localhost/c#\r
-file://localhost/c#\r
-file://localhost/c#\r
-file\r
-localhost\r
-\\localhost\c#\r
-\r
--1\r
-True\r
-True\r
-True\r
-False\r
-Dns\r
-/c#\r
-/c#\r
-localhost\r
-\r
-\r
-------------------------- localhost should not be \\test.domain.com\c. No fragment.\r
-file://test.domain.com/c#\r
-file://test.domain.com/c#\r
-file://test.domain.com/c#\r
-file\r
-test.domain.com\r
-\\test.domain.com\c#\r
-\r
--1\r
-True\r
-True\r
-False\r
-False\r
-Dns\r
-/c#\r
-/c#\r
-test.domain.com\r
-\r
-\r
-------------------------- MS.NET totally rejects Unix Path\r
+------------------------- MS.NET totally rejects Unix Path\r
 /foo.txt\r
 file:///foo.txt\r
 file:///foo.txt\r

diff --git a/mcs/class/System/Test/System/test-uri-props.txt b/mcs/class/System/Test/System/test-uri-props.txt
index 94bdf9b232074a10453b6f12659b826abfbf4399..92f2163fc8d1c121fe764b6bd5f4a8a19b7256b2 100755 (executable)
--- a/mcs/class/System/Test/System/test-uri-props.txt
+++ b/mcs/class/System/Test/System/test-uri-props.txt
@@ -720,6 +720,63 @@ Dns
 localhost\r
 #bookmark\r
 \r
+-------------------------\r
+file://localhost/c#fragment\r
+file://localhost/c#fragment\r
+file://localhost/c#fragment\r
+file\r
+localhost\r
+\\localhost\c\r
+\r
+-1\r
+True\r
+True\r
+True\r
+False\r
+Dns\r
+/c\r
+/c\r
+localhost\r
+#fragment\r
+\r
+-------------------------\r
+file://test.domain.com/c#\r
+file://test.domain.com/c#\r
+file://test.domain.com/c#\r
+file\r
+test.domain.com\r
+\\test.domain.com\c\r
+\r
+-1\r
+True\r
+True\r
+False\r
+False\r
+Dns\r
+/c\r
+/c\r
+test.domain.com\r
+#\r
+\r
+-------------------------\r
+file://test.domain.com/c#bookmark\r
+file://test.domain.com/c#bookmark\r
+file://test.domain.com/c#bookmark\r
+file\r
+test.domain.com\r
+\\test.domain.com\c\r
+\r
+-1\r
+True\r
+True\r
+False\r
+False\r
+Dns\r
+/c\r
+/c\r
+test.domain.com\r
+#bookmark\r
+\r
 -------------------------\r
 //localhost/c#\r
 file://localhost/c%23\r