Merge branch 'fixes/git-locks-serializable' into features/using-cache-manager

Author: StanleyGoldman

src/GitHub.Api/Git/GitLock.cs

@@ -5,20 +5,14 @@ namespace GitHub.Unity
     [Serializable]
     public struct GitLock
     {
-        public static GitLock Default = new GitLock(null, null, null, -1);
-
-        public readonly int ID;
-        public readonly string Path;
-        public readonly string FullPath;
-        public readonly string User;
-
-        public GitLock(string path, string fullPath, string user, int id)
-        {
-            Path = path;
-            FullPath = fullPath;
-            User = user;
-            ID = id;
-        }
+        public static GitLock Default = new GitLock {
+            ID = -1
+        };
+
+        public int ID;
+        public string Path;
+        public string FullPath;
+        public string User;
 
         public override bool Equals(object other)
         {

src/GitHub.Api/Git/GitObjectFactory.cs

@@ -26,7 +26,12 @@ public GitLock CreateGitLock(string path, string user, int id)
             var npath = new NPath(path).MakeAbsolute();
             var fullPath = npath.RelativeTo(environment.RepositoryPath);
 
-            return new GitLock(path, fullPath, user, id);
+            return new GitLock {
+                Path = path,
+                FullPath = fullPath,
+                User = user,
+                ID = id
+            };
         }
     }
 }

src/tests/TestUtils/Substitutes/SubstituteFactory.cs

@@ -325,7 +325,12 @@ public IGitObjectFactory CreateGitObjectFactory(string gitRepoPath)
                 var user = (string)info[1];
                 var id = (int)info[2];
 
-                return new GitLock(path, gitRepoPath + @"\" + path, user, id);
+                return new GitLock {
+                    Path = path,
+                    FullPath = gitRepoPath + @"\" + path,
+                    User = user,
+                    ID = id
+                };
             });
 
             return gitObjectFactory;

src/tests/UnitTests/IO/LockOutputProcessorTests.cs

@@ -63,8 +63,18 @@ public void ShouldParseTwoLocksFormat1()
             };
 
             var expected = new[] {
-                new GitLock("folder/somefile.png", TestRootPath + @"\folder/somefile.png", "GitHub User", 12),
-                new GitLock("somezip.zip", TestRootPath + @"\somezip.zip", "GitHub User", 21)
+                new GitLock {
+                    Path = "folder/somefile.png",
+                    FullPath = TestRootPath + @"\folder/somefile.png",
+                    User = "GitHub User",
+                    ID = 12
+                },
+                new GitLock {
+                    Path = "somezip.zip",
+                    FullPath = TestRootPath + @"\somezip.zip",
+                    User = "GitHub User",
+                    ID = 21
+                }
             };
 
             AssertProcessOutput(output, expected);
@@ -81,8 +91,18 @@ public void ShouldParseTwoLocksFormat2()
             };
 
             var expected = new[] {
-                new GitLock("folder/somefile.png", TestRootPath + @"\folder/somefile.png", "GitHub User", 12),
-                new GitLock("somezip.zip", TestRootPath + @"\somezip.zip", "GitHub User", 21)
+                new GitLock {
+                    Path = "folder/somefile.png",
+                    FullPath = TestRootPath + @"\folder/somefile.png",
+                    User = "GitHub User",
+                    ID = 12
+                },
+                new GitLock {
+                    Path = "somezip.zip",
+                    FullPath = TestRootPath + @"\somezip.zip",
+                    User = "GitHub User",
+                    ID = 21
+                }
             };
 
             AssertProcessOutput(output, expected);
@@ -97,7 +117,12 @@ public void ShouldParseLocksOnFileWithNumericFirstLetter()
             };
 
             var expected = new[] {
-                new GitLock("2_TurtleDoves.jpg", TestRootPath + @"\2_TurtleDoves.jpg", "Tree", 100)
+                new GitLock {
+                    Path = "2_TurtleDoves.jpg",
+                    FullPath = TestRootPath + @"\2_TurtleDoves.jpg",
+                    User = "Tree",
+                    ID = 100
+                }
             };
 
             AssertProcessOutput(output, expected);