Fix FileSystem AddDirectory separator issue

Author: ilkerde

TestingHelpers/CrossPlatformExtensions.cs

@@ -7,22 +7,27 @@ public static class XFS
     {
         public static string Path(string path, Func<bool> isUnixF = null)
         {
-            if (isUnixF == null)
-            {
-                isUnixF = () =>
-                {
-                    int p = (int)Environment.OSVersion.Platform;
-                    return (p == 4) || (p == 6) || (p == 128);
-                };
-            }
-                
-            if (isUnixF())
+            var isUnix = isUnixF ?? IsUnixPlatform;
+
+            if (isUnix())
             {
                 path = Regex.Replace(path, @"^[a-zA-Z]:(?<path>.*)$", "${path}");
                 path = path.Replace(@"\", "/");
             }
 
             return path;
         }
+
+        public static string Separator(Func<bool> isUnixF = null)
+        {
+            var isUnix = isUnixF ?? IsUnixPlatform;
+            return isUnix() ? "/" : @"\";
+        }
+
+        public static bool IsUnixPlatform()
+        {
+            int p = (int)Environment.OSVersion.Platform;
+            return (p == 4) || (p == 6) || (p == 128);
+        }
     }
 }

TestingHelpers/MockFileSystem.cs

@@ -95,6 +95,7 @@ public void AddFile(string path, MockFileData mockFile)
         public void AddDirectory(string path)
         {
             var fixedPath = FixPath(path);
+            var separator = XFS.Separator();
 
             lock (files)
             {
@@ -103,7 +104,7 @@ public void AddDirectory(string path)
                     throw new UnauthorizedAccessException(string.Format(CultureInfo.InvariantCulture, "Access to the path '{0}' is denied.", path));
 
                 var lastIndex = 0;
-                while ((lastIndex = path.IndexOf('\\', lastIndex + 1)) > -1)
+                while ((lastIndex = path.IndexOf(separator, lastIndex + 1)) > -1)
                 {
                     var segment = path.Substring(0, lastIndex + 1);
                     if (!directory.Exists(segment))
@@ -112,7 +113,7 @@ public void AddDirectory(string path)
                     }
                 }
 
-                var s = path.EndsWith("\\", StringComparison.OrdinalIgnoreCase) ? path : path + "\\";
+                var s = path.EndsWith(separator, StringComparison.OrdinalIgnoreCase) ? path : path + separator;
                 files[s] = new MockDirectoryData();
             }
         }