beautifies code

adds more null argument checks
schalpat · Aug 7, 2016 · 0a9d860 · 0a9d860
1 parent c851dc2
commit 0a9d860
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 33 deletions.
diff --git a/TestHelpers.Tests/MockDirectoryTests.cs b/TestHelpers.Tests/MockDirectoryTests.cs
@@ -1023,7 +1023,7 @@ public void MockDirectory_GetCurrentDirectory_ShouldReturnValueFromFileSystemCon
 
         [Test]
         public void MockDirectory_GetCurrentDirectory_ShouldReturnDefaultPathWhenNotSet() {
-            string directory = System.IO.Path.GetTempPath();
+            string directory = Path.GetTempPath();
             var fileSystem = new MockFileSystem();
 
             var actual = fileSystem.Directory.GetCurrentDirectory();

diff --git a/TestHelpers.Tests/MockFileTests.cs b/TestHelpers.Tests/MockFileTests.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using NUnit.Framework;
 
@@ -554,7 +556,7 @@ public void Serializable_works()
             MockFileData data = new MockFileData("Text Contents");
 
             //Act
-            System.Runtime.Serialization.IFormatter formatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
+            IFormatter formatter = new BinaryFormatter();
             Stream stream = new MemoryStream();
             formatter.Serialize(stream, data);
 
@@ -571,7 +573,7 @@ public void Serializable_can_deserialize()
             //Act
             MockFileData data = new MockFileData(textContentStr);
 
-            System.Runtime.Serialization.IFormatter formatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
+            IFormatter formatter = new BinaryFormatter();
             Stream stream = new MemoryStream();
             formatter.Serialize(stream, data);
 

diff --git a/TestingHelpers/MockDirectory.cs b/TestingHelpers/MockDirectory.cs
@@ -18,6 +18,11 @@ public class MockDirectory : DirectoryBase
 
         public MockDirectory(IMockFileDataAccessor mockFileDataAccessor, FileBase fileBase, string currentDirectory)
         {
+            if (mockFileDataAccessor == null)
+            {
+                throw new ArgumentNullException("mockFileDataAccessor");
+            }
+
             this.currentDirectory = currentDirectory;
             this.mockFileDataAccessor = mockFileDataAccessor;
             this.fileBase = fileBase;
@@ -37,7 +42,7 @@ public override DirectoryInfoBase CreateDirectory(string path, DirectorySecurity
 
             if (path.Length == 0)
             {
-                throw new ArgumentException("Path cannot be the empty string or all whitespace.", "path");
+                throw new ArgumentException(Properties.Resources.PATH_CANNOT_BE_THE_EMPTY_STRING_OR_ALL_WHITESPACE, "path");
             }
 
             if (mockFileDataAccessor.FileExists(path))
@@ -100,12 +105,12 @@ public override bool Exists(string path)
 
         public override DirectorySecurity GetAccessControl(string path)
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override DirectorySecurity GetAccessControl(string path, AccessControlSections includeSections)
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override DateTime GetCreationTime(string path)
@@ -284,7 +289,7 @@ public override DirectoryInfoBase GetParent(string path)
 
             if (path.Length == 0)
             {
-                throw new ArgumentException("Path cannot be the empty string or all whitespace.", "path");
+                throw new ArgumentException(Properties.Resources.PATH_CANNOT_BE_THE_EMPTY_STRING_OR_ALL_WHITESPACE, "path");
             }
 
             if (MockPath.HasIllegalCharacters(path, false))
@@ -358,7 +363,7 @@ public override void Move(string sourceDirName, string destDirName)
 
         public override void SetAccessControl(string path, DirectorySecurity directorySecurity)
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override void SetCreationTime(string path, DateTime creationTime)

diff --git a/TestingHelpers/MockDirectoryData.cs b/TestingHelpers/MockDirectoryData.cs
@@ -1,7 +1,8 @@
 namespace System.IO.Abstractions.TestingHelpers
 {
     [Serializable]
-    public class MockDirectoryData : MockFileData {
+    public class MockDirectoryData : MockFileData
+    {
         public override bool IsDirectory { get { return true; } }
 
         public MockDirectoryData() : base(string.Empty)

diff --git a/TestingHelpers/MockDirectoryInfo.cs b/TestingHelpers/MockDirectoryInfo.cs
@@ -263,7 +263,7 @@ public override FileSystemInfoBase[] GetFileSystemInfos(string searchPattern)
 
         public override FileSystemInfoBase[] GetFileSystemInfos(string searchPattern, SearchOption searchOption)
         {
-            return GetDirectories(searchPattern, searchOption).OfType<FileSystemInfoBase>().Concat(this.GetFiles(searchPattern, searchOption)).ToArray();
+            return GetDirectories(searchPattern, searchOption).OfType<FileSystemInfoBase>().Concat(GetFiles(searchPattern, searchOption)).ToArray();
         }
 
         public override void MoveTo(string destDirName)

diff --git a/TestingHelpers/MockDriveInfoFactory.cs b/TestingHelpers/MockDriveInfoFactory.cs
@@ -79,7 +79,7 @@ public bool Equals(string x, string y)
 
                 if (x[1] == ':' && y[1] == ':')
                 {
-                    return Char.ToUpperInvariant(x[0]) == Char.ToUpperInvariant(y[0]);
+                    return char.ToUpperInvariant(x[0]) == char.ToUpperInvariant(y[0]);
                 }
 
                 return false;

diff --git a/TestingHelpers/MockFileData.cs b/TestingHelpers/MockFileData.cs
@@ -17,7 +17,8 @@ public class MockFileData
         /// <summary>
         /// The null object.
         /// </summary>
-        public static readonly MockFileData NullObject = new MockFileData(string.Empty) {
+        public static readonly MockFileData NullObject = new MockFileData(string.Empty)
+        {
           LastWriteTime = new DateTime(1601, 01, 01, 00, 00, 00, DateTimeKind.Utc),
           LastAccessTime = new DateTime(1601, 01, 01, 00, 00, 00, DateTimeKind.Utc),
           CreationTime = new DateTime(1601, 01, 01, 00, 00, 00, DateTimeKind.Utc),

diff --git a/TestingHelpers/MockFileInfo.cs b/TestingHelpers/MockFileInfo.cs
@@ -10,6 +10,11 @@ internal class MockFileInfo : FileInfoBase
 
         public MockFileInfo(IMockFileDataAccessor mockFileSystem, string path)
         {
+            if (mockFileSystem == null)
+            {
+                throw new ArgumentNullException("mockFileSystem");
+            }
+
             this.mockFileSystem = mockFileSystem;
             this.path = path;
         }
@@ -78,7 +83,7 @@ public override string Extension
             {
                 // System.IO.Path.GetExtension does only string manipulation,
                 // so it's safe to delegate.
-                return Path.GetExtension(this.path);
+                return Path.GetExtension(path);
             }
         }
 
@@ -134,7 +139,7 @@ public override DateTime LastWriteTimeUtc
             get
             {
                 if (MockFileData == null) throw new FileNotFoundException("File not found", path);
-                return MockFileData.LastWriteTime.UtcDateTime;    
+                return MockFileData.LastWriteTime.UtcDateTime;
             }
             set
             {
@@ -159,7 +164,7 @@ public override FileInfoBase CopyTo(string destFileName)
             new MockFile(mockFileSystem).Copy(FullName, destFileName);
             return mockFileSystem.FileInfo.FromFileName(destFileName);
         }
-        
+
         public override FileInfoBase CopyTo(string destFileName, bool overwrite)
         {
             new MockFile(mockFileSystem).Copy(FullName, destFileName, overwrite);
@@ -194,12 +199,12 @@ public override void Encrypt()
 
         public override FileSecurity GetAccessControl()
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override FileSecurity GetAccessControl(AccessControlSections includeSections)
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override void MoveTo(string destFileName)
@@ -240,24 +245,24 @@ public override Stream OpenWrite()
 
         public override FileInfoBase Replace(string destinationFileName, string destinationBackupFileName)
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override FileInfoBase Replace(string destinationFileName, string destinationBackupFileName, bool ignoreMetadataErrors)
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override void SetAccessControl(FileSecurity fileSecurity)
         {
-            throw new NotImplementedException("This test helper hasn't been implemented yet. They are implemented on an as-needed basis. As it seems like you need it, now would be a great time to send us a pull request over at https://github.com/tathamoddie/System.IO.Abstractions. You know, because it's open source and all.");
+            throw new NotImplementedException(Properties.Resources.NOT_IMPLEMENTED_EXCEPTION);
         }
 
         public override DirectoryInfoBase Directory
         {
             get
             {
-                return mockFileSystem.DirectoryInfo.FromDirectoryName(this.DirectoryName);
+                return mockFileSystem.DirectoryInfo.FromDirectoryName(DirectoryName);
             }
         }
 
@@ -267,7 +272,7 @@ public override string DirectoryName
             {
                 // System.IO.Path.GetDirectoryName does only string manipulation,
                 // so it's safe to delegate.
-                return Path.GetDirectoryName(this.path);
+                return Path.GetDirectoryName(path);
             }
         }
 
@@ -283,7 +288,7 @@ public override bool IsReadOnly
                 if (MockFileData == null) throw new FileNotFoundException("File not found", path);
                 if(value)
                     MockFileData.Attributes |= FileAttributes.ReadOnly;
-                else 
+                else
                     MockFileData.Attributes &= ~FileAttributes.ReadOnly;
             }
         }

diff --git a/TestingHelpers/MockFileInfoFactory.cs b/TestingHelpers/MockFileInfoFactory.cs
@@ -3,10 +3,15 @@
     [Serializable]
     public class MockFileInfoFactory : IFileInfoFactory
     {
-        readonly IMockFileDataAccessor mockFileSystem;
+        private readonly IMockFileDataAccessor mockFileSystem;
 
         public MockFileInfoFactory(IMockFileDataAccessor mockFileSystem)
         {
+            if (mockFileSystem == null)
+            {
+                throw new ArgumentNullException("mockFileSystem");
+            }
+
             this.mockFileSystem = mockFileSystem;
         }
 

diff --git a/TestingHelpers/MockFileStream.cs b/TestingHelpers/MockFileStream.cs
@@ -3,8 +3,8 @@
     [Serializable]
     public class MockFileStream : MemoryStream
     {
-        readonly IMockFileDataAccessor mockFileDataAccessor;
-        readonly string path;
+        private readonly IMockFileDataAccessor mockFileDataAccessor;
+        private readonly string path;
 
         public MockFileStream(IMockFileDataAccessor mockFileDataAccessor, string path, bool forAppend = false)
         {

diff --git a/TestingHelpers/MockFileSystem.cs b/TestingHelpers/MockFileSystem.cs
@@ -9,12 +9,12 @@ namespace System.IO.Abstractions.TestingHelpers
     [Serializable]
     public class MockFileSystem : IFileSystem, IMockFileDataAccessor
     {
-        readonly IDictionary<string, MockFileData> files;
-        readonly FileBase file;
-        readonly DirectoryBase directory;
-        readonly IFileInfoFactory fileInfoFactory;
-        readonly PathBase pathField;
-        readonly IDirectoryInfoFactory directoryInfoFactory;
+        private readonly IDictionary<string, MockFileData> files;
+        private readonly FileBase file;
+        private readonly DirectoryBase directory;
+        private readonly IFileInfoFactory fileInfoFactory;
+        private readonly PathBase pathField;
+        private readonly IDirectoryInfoFactory directoryInfoFactory;
         private readonly IDriveInfoFactory driveInfoFactory;
 
         [NonSerialized]

diff --git a/TestingHelpers/MockPath.cs b/TestingHelpers/MockPath.cs
@@ -10,12 +10,17 @@ namespace System.IO.Abstractions.TestingHelpers
     [Serializable]
     public class MockPath : PathWrapper
     {
-        readonly IMockFileDataAccessor mockFileDataAccessor;
+        private readonly IMockFileDataAccessor mockFileDataAccessor;
 
         private static readonly char[] InvalidAdditionalPathChars = { '*', '?' };
 
         public MockPath(IMockFileDataAccessor mockFileDataAccessor)
         {
+            if (mockFileDataAccessor == null)
+            {
+                throw new ArgumentNullException("mockFileDataAccessor");
+            }
+
             this.mockFileDataAccessor = mockFileDataAccessor;
         }
 

diff --git a/TestingHelpers/Properties/Resources.Designer.cs b/TestingHelpers/Properties/Resources.Designer.cs
diff --git a/TestingHelpers/Properties/Resources.resx b/TestingHelpers/Properties/Resources.resx
@@ -135,4 +135,7 @@
   <data name="VALUE_CANNOT_BE_NULL" xml:space="preserve">
     <value>Value cannot be null.</value>
   </data>
+  <data name="PATH_CANNOT_BE_THE_EMPTY_STRING_OR_ALL_WHITESPACE" xml:space="preserve">
+    <value>Path cannot be the empty string or all whitespace.</value>
+  </data>
 </root>
diff --git a/TestingHelpers/StringExtensions.cs b/TestingHelpers/StringExtensions.cs
@@ -6,6 +6,7 @@ namespace System.IO.Abstractions.TestingHelpers
 {
     internal static class StringExtensions
     {
+        [Pure]
         internal static string[] SplitLines(this string input)
         {
             var list = new List<string>();
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ namespace System.IO.Abstractions.TestingHelpers @@
     {
         internal static class StringExtensions
         {
+            [Pure]
             internal static string[] SplitLines(this string input)
             {
                 var list = new List<string>();
@@ Expand Down @@