From 2d30bdc229b6370e2b81c602bc1de616815a209a Mon Sep 17 00:00:00 2001
From: Ian Hays <ianha@microsoft.com>
Date: Mon, 6 Jun 2016 13:56:48 -0700
Subject: [PATCH] Fix Filesystem tests failing from path changes

Changes in path validation disabled some of the FileSystem tests. Re-enable them with the new path logic in place.


Commit migrated from https://github.com/dotnet/corefx/commit/11d47f621e0064e5d6384486b4b4e4e02efb15e7
---
 .../tests/Directory/CreateDirectory.cs                    | 7 ++++++-
 src/libraries/System.IO.FileSystem/tests/File/Move.cs     | 5 ++++-
 .../System.IO.FileSystem/tests/PortedCommon/IOInputs.cs   | 8 +++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs b/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
index 7b68e58bcbf..c2986a943e4 100644
--- a/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
+++ b/src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
@@ -38,7 +38,12 @@ public void PathWithInvalidCharactersAsPath_ThrowsArgumentException()
             var paths = IOInputs.GetPathsWithInvalidCharacters();
             Assert.All(paths, (path) =>
             {
-                Assert.Throws<ArgumentException>(() => Create(path));
+                if (path.Equals(@"\\?\"))
+                    Assert.Throws<IOException>(() => Create(path));
+                else if (path.Contains(@"\\?\"))
+                    Assert.Throws<DirectoryNotFoundException>(() => Create(path));
+                else
+                    Assert.Throws<ArgumentException>(() => Create(path));
             });
         }
 
diff --git a/src/libraries/System.IO.FileSystem/tests/File/Move.cs b/src/libraries/System.IO.FileSystem/tests/File/Move.cs
index 198a7c1a359..3845ca366c6 100644
--- a/src/libraries/System.IO.FileSystem/tests/File/Move.cs
+++ b/src/libraries/System.IO.FileSystem/tests/File/Move.cs
@@ -50,7 +50,10 @@ public void PathWithIllegalCharacters()
             testFile.Create().Dispose();
             Assert.All(IOInputs.GetPathsWithInvalidCharacters(), (invalid) =>
             {
-                Assert.Throws<ArgumentException>(() => Move(testFile.FullName, invalid));
+                if (invalid.Contains(@"\\?\"))
+                    Assert.Throws<IOException>(() => Move(testFile.FullName, invalid));
+                else
+                    Assert.Throws<ArgumentException>(() => Move(testFile.FullName, invalid));
             });
         }
 
diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs b/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs
index 15e3d69b46d..1a1730aee47 100644
--- a/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs
+++ b/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOInputs.cs
@@ -180,11 +180,9 @@ public static IEnumerable<string> GetPathsWithInvalidCharacters()
             yield return "\0";
             yield return "middle\0path";
             yield return "trailing\0";
-
-            // TODO: #6931 Add these back in some fashion
-            //yield return @"\\?\";
-            //yield return @"\\?\UNC\";
-            //yield return @"\\?\UNC\LOCALHOST";
+            yield return @"\\?\";
+            yield return @"\\?\UNC\";
+            yield return @"\\?\UNC\LOCALHOST";
         }
         else
         {
-- 
GitLab