fixup! Enforce repo.RetrieveStatus() test coverage

nulltoken · nulltoken · commit 051c3ecbc16a · 2015-04-07T11:12:52.000+02:00
diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -614,19 +614,23 @@ public void CanHandleTwoStatusEntryChangesWithTheSamePath()
 
                 Commit commit = repo.ObjectDatabase.CreateCommit(Constants.Signature, Constants.Signature, "A symlink", tree, Enumerable.Empty<Commit>(), false);
                 repo.Refs.UpdateTarget("HEAD", commit.Id.Sha);
+
+                // Sets the index to the just created commit
                 repo.Reset(ResetMode.Mixed);
 
                 string parentPath = Path.Combine(repo.Info.WorkingDirectory, "include/Nu");
 
                 Touch(parentPath, "Nu.h", "awesome content\n");
 
                 RepositoryStatus status = repo.RetrieveStatus(
-                    new StatusOptions{ DetectRenamesInIndex = true, DetectRenamesInWorkDir = true });
+                    new StatusOptions { DetectRenamesInIndex = true, DetectRenamesInWorkDir = true });
 
                 Assert.Equal(2, status.Count());
 
                 var expected = Path.Combine("include", "Nu", "Nu.h");
 
+                // Two different code paths here because both HEAD and the Index contains a symlink
+                // But we can't trust a Windows filesystem to correctly handle this kind of filemode
                 if (IsRunningOnUnix())
                 {
                     Assert.Equal(expected, status.RenamedInWorkDir.Single().FilePath);
@@ -638,6 +642,16 @@ public void CanHandleTwoStatusEntryChangesWithTheSamePath()
                     Assert.Equal(Path.Combine("objc", "Nu.h"), status.Missing.Single().FilePath);
                 }
 
+                // Replace the symlink in the index with a plain file
+                repo.Stage(parentPath);
+
+                status = repo.RetrieveStatus(
+                    new StatusOptions { DetectRenamesInIndex = true, DetectRenamesInWorkDir = true });
+
+                Assert.Equal(2, status.Count());
+
+                Assert.Equal(expected, status.Staged.Single().FilePath);
+                Assert.Equal(Path.Combine("objc", "Nu.h"), status.Missing.Single().FilePath);
             }
         }
     }
