Fix order of InvalidPathChars on windows.

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

diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index d98b16d0fc5614ed8bfd930702bb966bb859d447..80ff011f07d2fd6049032890f92fe825cd5f5536 100644 (file)
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-19     Boris Kirzner <borisk@mainsoft.com>
+
+       * Path.cs: fix order of InvalidPathChars on windows.
+
 2007-01-31  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * StreamReader.cs: Removed checks for non-existing directory or file,

diff --git a/mcs/class/corlib/System.IO/Path.cs b/mcs/class/corlib/System.IO/Path.cs
index 44b391d69985552c95395ea8cebc03344c95fa18..6cc6e043b47c6914eb3a6b7f16f7ba0cdca5fdb9 100644 (file)
--- a/mcs/class/corlib/System.IO/Path.cs
+++ b/mcs/class/corlib/System.IO/Path.cs
@@ -429,10 +429,10 @@ namespace System.IO {
                {
                        // return a new array as we do not want anyone to be able to change the values
                        if (Environment.IsRunningOnWindows) {
-                               return new char [36] { '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+                               return new char [36] { '\x22', '\x3C', '\x3E', '\x7C', '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
                                        '\x08', '\x09', '\x0A', '\x0B', '\x0C', '\x0D', '\x0E', '\x0F', '\x10', '\x11', '\x12', 
                                        '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1A', '\x1B', '\x1C', '\x1D', 
-                                       '\x1E', '\x1F', '\x22', '\x3C', '\x3E', '\x7C' };
+                                       '\x1E', '\x1F' };
                        } else {
                                return new char [1] { '\x00' };
                        }

diff --git a/mcs/class/corlib/Test/System.IO/ChangeLog b/mcs/class/corlib/Test/System.IO/ChangeLog
index d6e81ae427b1bb080e1a7a7bd4fe197623b43703..65f8f1fd1e841c0a4202c78087be99af563fd2a2 100644 (file)
--- a/mcs/class/corlib/Test/System.IO/ChangeLog
+++ b/mcs/class/corlib/Test/System.IO/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-19     Boris Kirzner <borisk@mainsoft.com>
+
+       * DirectoryTest.cs, PathTest.cs: added test for 
+       order of InvalidPathChars on windows.
+
 2007-01-31  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * FileStreamTest.cs: Added and improved tests to verify whether the

diff --git a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
index 152e4d0e9d5b0d02724895aeab098d3fd82b338a..f2d4a3c105e7378cd16b38f81fb7981721934c77 100644 (file)
--- a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
+++ b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
@@ -98,7 +98,7 @@ public class DirectoryTest
                string path = TempFolder + DSC + "DirectoryTest.Test";\r
                DeleteDirectory (path);\r
                try {\r
-                       path += Path.InvalidPathChars [0];\r
+                       path += '\x00';\r
                        path += ".2";\r
                        DirectoryInfo info = Directory.CreateDirectory (path);\r
                } finally {\r

diff --git a/mcs/class/corlib/Test/System.IO/PathTest.cs b/mcs/class/corlib/Test/System.IO/PathTest.cs
index d4fbba920fc17fea89361145b34a3b17d7ebe416..da6cc6da192a412444a0600abeed8bc79a83155a 100644 (file)
--- a/mcs/class/corlib/Test/System.IO/PathTest.cs
+++ b/mcs/class/corlib/Test/System.IO/PathTest.cs
@@ -834,6 +834,22 @@ namespace MonoTests.System.IO
                        }
                }
 
+               [Test]
+               public void GetInvalidPathChars_Order()
+               {
+                       if (Windows) {
+                               char [] invalid = Path.GetInvalidPathChars ();
+                               char [] expected = new char [36] { '\x22', '\x3C', '\x3E', '\x7C', '\x00', '\x01', '\x02',
+                                       '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x09', '\x0A', '\x0B', '\x0C', '\x0D',
+                                       '\x0E', '\x0F', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18',
+                                       '\x19', '\x1A', '\x1B', '\x1C', '\x1D', '\x1E', '\x1F' };
+                               AssertEquals (expected.Length, invalid.Length);
+                               for (int i = 0; i < expected.Length; i++ ) {
+                                       AssertEquals( "Character at position " + i,expected [i], invalid [i]);
+                               }
+                       }
+               }
+
                [Test]
                public void GetInvalidPathChars_Modify ()
                {