Improve naming / explicitness

ilkerde · ilkerde · commit 9a899a89a66d · 2014-09-17T09:59:23.000+02:00
diff --git a/TestHelpers.Tests/MockDirectoryInfoTests.cs b/TestHelpers.Tests/MockDirectoryInfoTests.cs
@@ -3,6 +3,8 @@
 
 namespace System.IO.Abstractions.TestingHelpers.Tests
 {
+    using XFS = MockUnixSupport;
+
     [TestFixture]
     public class MockDirectoryInfoTests
     {
diff --git a/TestHelpers.Tests/MockDirectoryTests.cs b/TestHelpers.Tests/MockDirectoryTests.cs
@@ -4,6 +4,8 @@
 
 namespace System.IO.Abstractions.TestingHelpers.Tests
 {
+    using XFS = MockUnixSupport;
+
     [TestFixture]
     public class MockDirectoryTests
     {
@@ -755,7 +757,7 @@ public void MockDirectory_GetParent_ShouldThrowArgumentExceptionIfPathHasIllegal
         {
             if (XFS.IsUnixPlatform())
             {
-                Assert.Pass();
+                Assert.Pass("Path.GetInvalidChars() does not return anything on Mono");
                 return;
             }
 
diff --git a/TestHelpers.Tests/MockFileInfoTests.cs b/TestHelpers.Tests/MockFileInfoTests.cs
@@ -4,6 +4,8 @@
 
 namespace System.IO.Abstractions.TestingHelpers.Tests
 {
+    using XFS = MockUnixSupport;
+
     [TestFixture]
     public class MockFileInfoTests
     {
diff --git a/TestHelpers.Tests/MockFileSystemTests.cs b/TestHelpers.Tests/MockFileSystemTests.cs
@@ -97,7 +97,7 @@ public void Is_Serializable()
         public void MockFileSystem_AddDirectory_ShouldCreateDirectory()
         {
             // Arrange
-            string baseDirectory = XFS.Path(@"C:\Test");
+            string baseDirectory = MockUnixSupport.Path(@"C:\Test");
             var fileSystem = new MockFileSystem();
 
             // Act
diff --git a/TestHelpers.Tests/MockFileTests.cs b/TestHelpers.Tests/MockFileTests.cs
@@ -6,6 +6,8 @@
 
 namespace System.IO.Abstractions.TestingHelpers.Tests
 {
+    using XFS = MockUnixSupport;
+
     [TestFixture]
     public class MockFileTests
     {
diff --git a/TestHelpers.Tests/MockPathTests.cs b/TestHelpers.Tests/MockPathTests.cs
@@ -3,6 +3,8 @@
 
 namespace System.IO.Abstractions.TestingHelpers.Tests
 {
+    using XFS = MockUnixSupport;
+
     public class MockPathTests
     {
         static readonly string TestPath = XFS.Path("C:\\test\\test.bmp");
diff --git a/TestHelpers.Tests/MockUnixSupportTests.cs b/TestHelpers.Tests/MockUnixSupportTests.cs
@@ -4,18 +4,18 @@
 namespace System.IO.Abstractions.TestingHelpers.Tests
 {
     [TestFixture]
-    public class CrossPlatformExtensionsTests
+    public class MockUnixSupportTests
     {
         [Test]
         public void Should_Convert_Backslashes_To_Slashes_On_Unix()
         {
-            Assert.AreEqual("/test/", XFS.Path(@"\test\", () => true));
+            Assert.AreEqual("/test/", MockUnixSupport.Path(@"\test\", () => true));
         }
 
         [Test]
         public void Should_Remove_Drive_Letter_On_Unix()
         {
-            Assert.AreEqual("/test/", XFS.Path(@"c:\test\", () => true));
+            Assert.AreEqual("/test/", MockUnixSupport.Path(@"c:\test\", () => true));
         }
     }
 }
diff --git a/TestHelpers.Tests/TestHelpers.Tests.csproj b/TestHelpers.Tests/TestHelpers.Tests.csproj
@@ -57,9 +57,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -75,7 +73,7 @@
     <Compile Include="MockFileTests.cs" />
     <Compile Include="MockPathTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="CrossPlatformExtensionsTests.cs" />
+    <Compile Include="MockUnixSupportTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.IO.Abstractions\System.IO.Abstractions.csproj">
diff --git a/TestingHelpers/MockDirectory.cs b/TestingHelpers/MockDirectory.cs
@@ -6,6 +6,8 @@
 
 namespace System.IO.Abstractions.TestingHelpers
 {
+    using XFS = MockUnixSupport;
+
     [Serializable]
     public class MockDirectory : DirectoryBase
     {
@@ -172,19 +174,21 @@ private string[] GetFilesInternal(IEnumerable<string> files, string path, string
             path = EnsurePathEndsWithDirectorySeparator(path);
             path = mockFileDataAccessor.Path.GetFullPath(path);
 
-            string allDirectoriesPattern = XFS.IsUnixPlatform()
+            bool isUnix = XFS.IsUnixPlatform();
+
+            string allDirectoriesPattern = isUnix
                 ? @"([^<>:""/|?*]*/)*"
                 : @"([^<>:""/\\|?*]*\\)*";
 
             var fileNamePattern = searchPattern == "*"
-                ? XFS.IsUnixPlatform() ? @"[^/]*?/?" : @"[^\\]*?\\?"
+                ? isUnix ? @"[^/]*?/?" : @"[^\\]*?\\?"
                 : Regex.Escape(searchPattern)
-                .Replace(@"\*", XFS.IsUnixPlatform() ? @"[^<>:""/|?*]*?" : @"[^<>:""/\\|?*]*?")
-                .Replace(@"\?", XFS.IsUnixPlatform() ? @"[^<>:""/|?*]?" : @"[^<>:""/\\|?*]?");
+                    .Replace(@"\*", isUnix ? @"[^<>:""/|?*]*?" : @"[^<>:""/\\|?*]*?")
+                    .Replace(@"\?", isUnix ? @"[^<>:""/|?*]?" : @"[^<>:""/\\|?*]?");
 
             var pathPattern = string.Format(
                 CultureInfo.InvariantCulture,
-                XFS.IsUnixPlatform() ? @"(?i:^{0}{1}{2}(?:/?)$)" : @"(?i:^{0}{1}{2}(?:\\?)$)",
+                isUnix ? @"(?i:^{0}{1}{2}(?:/?)$)" : @"(?i:^{0}{1}{2}(?:\\?)$)",
                 Regex.Escape(path),
                 searchOption == SearchOption.AllDirectories ? allDirectoriesPattern : string.Empty,
                 fileNamePattern);
diff --git a/TestingHelpers/MockFileSystem.cs b/TestingHelpers/MockFileSystem.cs
@@ -4,6 +4,8 @@
 
 namespace System.IO.Abstractions.TestingHelpers
 {
+    using XFS = MockUnixSupport;
+
     [Serializable]
     public class MockFileSystem : IFileSystem, IMockFileDataAccessor
     {
@@ -21,7 +23,6 @@ public MockFileSystem(IDictionary<string, MockFileData> files, string currentDir
             if (String.IsNullOrEmpty(currentDirectory))
                 currentDirectory = System.IO.Path.GetTempPath();
 
-
             this.files = new Dictionary<string, MockFileData>(StringComparer.OrdinalIgnoreCase);
             pathField = new MockPath(this);
             file = new MockFile(this);
diff --git a/TestingHelpers/MockUnixSupport.cs b/TestingHelpers/MockUnixSupport.cs
@@ -3,9 +3,9 @@
 
 namespace System.IO.Abstractions.TestingHelpers
 {
-    public static class XFS
+    internal static class MockUnixSupport
     {
-        public static string Path(string path, Func<bool> isUnixF = null)
+        internal static string Path(string path, Func<bool> isUnixF = null)
         {
             var isUnix = isUnixF ?? IsUnixPlatform;
 
@@ -18,13 +18,13 @@ public static string Path(string path, Func<bool> isUnixF = null)
             return path;
         }
 
-        public static string Separator(Func<bool> isUnixF = null)
+        internal static string Separator(Func<bool> isUnixF = null)
         {
             var isUnix = isUnixF ?? IsUnixPlatform;
             return isUnix() ? "/" : @"\";
         }
 
-        public static bool IsUnixPlatform()
+        internal static bool IsUnixPlatform()
         {
             int p = (int)Environment.OSVersion.Platform;
             return (p == 4) || (p == 6) || (p == 128);
diff --git a/TestingHelpers/TestingHelpers.csproj b/TestingHelpers/TestingHelpers.csproj
@@ -57,9 +57,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="IMockFileDataAccessor.cs" />
@@ -76,7 +74,7 @@
     <Compile Include="MockPath.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StringExtensions.cs" />
-    <Compile Include="CrossPlatformExtensions.cs" />
+    <Compile Include="MockUnixSupport.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace System.IO.Abstractions.TestingHelpers.Tests`
`5`	`5`	`{`
	`6`	`+ using XFS = MockUnixSupport;`
	`7`	`+`
`6`	`8`	`[TestFixture]`
`7`	`9`	`public class MockDirectoryInfoTests`
`8`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace System.IO.Abstractions.TestingHelpers.Tests`
`6`	`6`	`{`
	`7`	`+ using XFS = MockUnixSupport;`
	`8`	`+`
`7`	`9`	`[TestFixture]`
`8`	`10`	`public class MockDirectoryTests`
`9`	`11`	`{`
`@@ -755,7 +757,7 @@ public void MockDirectory_GetParent_ShouldThrowArgumentExceptionIfPathHasIllegal`
`755`	`757`	`{`
`756`	`758`	`if (XFS.IsUnixPlatform())`
`757`	`759`	`{`
`758`		`- Assert.Pass();`
	`760`	`+ Assert.Pass("Path.GetInvalidChars() does not return anything on Mono");`
`759`	`761`	`return;`
`760`	`762`	`}`
`761`	`763`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void Is_Serializable()`
`97`	`97`	`public void MockFileSystem_AddDirectory_ShouldCreateDirectory()`
`98`	`98`	`{`
`99`	`99`	`// Arrange`
`100`		`- string baseDirectory = XFS.Path(@"C:\Test");`
	`100`	`+ string baseDirectory = MockUnixSupport.Path(@"C:\Test");`
`101`	`101`	`var fileSystem = new MockFileSystem();`
`102`	`102`
`103`	`103`	`// Act`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace System.IO.Abstractions.TestingHelpers.Tests`
`8`	`8`	`{`
	`9`	`+ using XFS = MockUnixSupport;`
	`10`	`+`
`9`	`11`	`[TestFixture]`
`10`	`12`	`public class MockFileTests`
`11`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,18 @@`
`4`	`4`	`namespace System.IO.Abstractions.TestingHelpers.Tests`
`5`	`5`	`{`
`6`	`6`	`[TestFixture]`
`7`		`- public class CrossPlatformExtensionsTests`
	`7`	`+ public class MockUnixSupportTests`
`8`	`8`	`{`
`9`	`9`	`[Test]`
`10`	`10`	`public void Should_Convert_Backslashes_To_Slashes_On_Unix()`
`11`	`11`	`{`
`12`		`- Assert.AreEqual("/test/", XFS.Path(@"\test\", () => true));`
	`12`	`+ Assert.AreEqual("/test/", MockUnixSupport.Path(@"\test\", () => true));`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`[Test]`
`16`	`16`	`public void Should_Remove_Drive_Letter_On_Unix()`
`17`	`17`	`{`
`18`		`- Assert.AreEqual("/test/", XFS.Path(@"c:\test\", () => true));`
	`18`	`+ Assert.AreEqual("/test/", MockUnixSupport.Path(@"c:\test\", () => true));`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`