Favor Identity usage over Signature in tests

nulltoken · nulltoken · commit f211cbc1a57d · 2015-08-18T10:56:58.000+02:00
diff --git a/LibGit2Sharp.Tests/CommitFixture.cs b/LibGit2Sharp.Tests/CommitFixture.cs
@@ -563,7 +563,7 @@ public void CommitWithInvalidSignatureConfigThrows(string name, string email)
         public void CanCommitWithSignatureFromConfig()
         {
             string repoPath = InitNewRepository();
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
 
             using (var repo = new Repository(repoPath, options))
@@ -586,7 +586,7 @@ public void CanCommitWithSignatureFromConfig()
                 AssertBlobContent(repo.Head[relativeFilepath], "nulltoken\n");
                 AssertBlobContent(commit[relativeFilepath], "nulltoken\n");
 
-                AssertCommitSignaturesAre(commit, Constants.Signature);
+                AssertCommitIdentitiesAre(commit, Constants.Identity);
             }
         }
 
diff --git a/LibGit2Sharp.Tests/ConfigurationFixture.cs b/LibGit2Sharp.Tests/ConfigurationFixture.cs
@@ -143,7 +143,7 @@ public void CanReadStringValue()
         [Fact]
         public void CanEnumerateGlobalConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
 
             var path = SandboxStandardTestRepoGitDir();
@@ -200,7 +200,7 @@ public void CanFindInLocalConfig()
         [Fact]
         public void CanFindInGlobalConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
 
             var path = SandboxStandardTestRepoGitDir();
@@ -387,7 +387,7 @@ public void CanAccessConfigurationWithoutARepository(Func<string, string> localC
         {
             var path = SandboxStandardTestRepoGitDir();
 
-            string globalConfigPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string globalConfigPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var options = new RepositoryOptions { GlobalConfigurationLocation = globalConfigPath };
 
             using (var repo = new Repository(path, options))
diff --git a/LibGit2Sharp.Tests/FilterFixture.cs b/LibGit2Sharp.Tests/FilterFixture.cs
@@ -232,7 +232,7 @@ public void CanFilterLargeFiles()
                 string attributesPath = Path.Combine(Directory.GetParent(repoPath).Parent.FullName, ".gitattributes");
                 FileInfo attributesFile = new FileInfo(attributesPath);
 
-                string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+                string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
                 var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
 
                 using (Repository repo = new Repository(repoPath, repositoryOptions))
@@ -377,7 +377,7 @@ private static FileInfo StageNewFile(IRepository repo, string contents = "null")
 
         private Repository CreateTestRepository(string path)
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             var repository = new Repository(path, repositoryOptions);
             CreateAttributesFile(repository, "* filter=test");
diff --git a/LibGit2Sharp.Tests/FilterSubstitutionCipherFixture.cs b/LibGit2Sharp.Tests/FilterSubstitutionCipherFixture.cs
@@ -21,7 +21,7 @@ public void SmugdeIsNotCalledForFileWhichDoesNotMatchAnAttributeEntry()
 
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".rot13";
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             using (var repo = new Repository(repoPath, repositoryOptions))
             {
@@ -61,7 +61,7 @@ public void CorrectlyEncodesAndDecodesInput()
 
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".rot13";
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             using (var repo = new Repository(repoPath, repositoryOptions))
             {
@@ -106,7 +106,7 @@ public void WhenStagedFileDoesNotMatchPathSpecFileIsNotFiltered(string pathSpec,
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + fileExtension;
 
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             using (var repo = new Repository(repoPath, repositoryOptions))
             {
@@ -141,7 +141,7 @@ public void CleanIsCalledIfAttributeEntryMatches(string filterAttribute, string
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".txt";
 
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             using (var repo = new Repository(repoPath, repositoryOptions))
             {
@@ -172,7 +172,7 @@ public void SmudgeIsCalledIfAttributeEntryMatches(string filterAttribute, string
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".txt";
 
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             using (var repo = new Repository(repoPath, repositoryOptions))
             {
diff --git a/LibGit2Sharp.Tests/NoteFixture.cs b/LibGit2Sharp.Tests/NoteFixture.cs
@@ -168,7 +168,7 @@ public void CreatingANoteWhichAlreadyExistsOverwritesThePreviousNote()
         [Fact]
         public void CanAddANoteWithSignatureFromConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             string path = SandboxBareTestRepo();
 
@@ -183,7 +183,7 @@ public void CanAddANoteWithSignatureFromConfig()
                 Assert.Equal("I'm batman!\n", newNote.Message);
                 Assert.Equal("batmobile", newNote.Namespace);
 
-                AssertCommitSignaturesAre(repo.Lookup<Commit>("refs/notes/batmobile"), Constants.Signature);
+                AssertCommitIdentitiesAre(repo.Lookup<Commit>("refs/notes/batmobile"), Constants.Identity);
             }
         }
 
@@ -265,7 +265,7 @@ public void RemovingANonExistingNoteDoesntThrow()
         [Fact]
         public void CanRemoveANoteWithSignatureFromConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
+            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
             RepositoryOptions options = new RepositoryOptions() { GlobalConfigurationLocation = configPath };
             string path = SandboxBareTestRepo();
 
@@ -280,7 +280,7 @@ public void CanRemoveANoteWithSignatureFromConfig()
 
                 Assert.Empty(notes);
 
-                AssertCommitSignaturesAre(repo.Lookup<Commit>("refs/notes/" + repo.Notes.DefaultNamespace), Constants.Signature);
+                AssertCommitIdentitiesAre(repo.Lookup<Commit>("refs/notes/" + repo.Notes.DefaultNamespace), Constants.Identity);
             }
         }
 
diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
@@ -328,11 +328,11 @@ private static RepositoryOptions BuildFakeRepositoryOptions(SelfCleaningDirector
         /// Creates a configuration file with user.name and user.email set to signature
         /// </summary>
         /// <remarks>The configuration file will be removed automatically when the tests are finished</remarks>
-        /// <param name="signature">The signature to use for user.name and user.email</param>
+        /// <param name="identity">The identity to use for user.name and user.email</param>
         /// <returns>The path to the configuration file</returns>
-        protected string CreateConfigurationWithDummyUser(Signature signature)
+        protected string CreateConfigurationWithDummyUser(Identity identity)
         {
-            return CreateConfigurationWithDummyUser(signature.Name, signature.Email);
+            return CreateConfigurationWithDummyUser(identity.Name, identity.Email);
         }
 
         protected string CreateConfigurationWithDummyUser(string name, string email)
@@ -361,13 +361,13 @@ protected string CreateConfigurationWithDummyUser(string name, string email)
         /// Asserts that the commit has been authored and committed by the specified signature
         /// </summary>
         /// <param name="commit">The commit</param>
-        /// <param name="signature">The signature to compare author and commiter to</param>
-        protected void AssertCommitSignaturesAre(Commit commit, Signature signature)
+        /// <param name="identity">The identity to compare author and commiter to</param>
+        protected void AssertCommitIdentitiesAre(Commit commit, Identity identity)
         {
-            Assert.Equal(signature.Name, commit.Author.Name);
-            Assert.Equal(signature.Email, commit.Author.Email);
-            Assert.Equal(signature.Name, commit.Committer.Name);
-            Assert.Equal(signature.Email, commit.Committer.Email);
+            Assert.Equal(identity.Name, commit.Author.Name);
+            Assert.Equal(identity.Email, commit.Author.Email);
+            Assert.Equal(identity.Name, commit.Committer.Name);
+            Assert.Equal(identity.Email, commit.Committer.Email);
         }
 
         protected static string Touch(string parent, string file, string content = null, Encoding encoding = null)

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ public void CommitWithInvalidSignatureConfigThrows(string name, string email)`
`563`	`563`	`public void CanCommitWithSignatureFromConfig()`
`564`	`564`	`{`
`565`	`565`	`string repoPath = InitNewRepository();`
`566`		`- string configPath = CreateConfigurationWithDummyUser(Constants.Signature);`
	`566`	`+ string configPath = CreateConfigurationWithDummyUser(Constants.Identity);`
`567`	`567`	`var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };`
`568`	`568`
`569`	`569`	`using (var repo = new Repository(repoPath, options))`
`@@ -586,7 +586,7 @@ public void CanCommitWithSignatureFromConfig()`
`586`	`586`	`AssertBlobContent(repo.Head[relativeFilepath], "nulltoken\n");`
`587`	`587`	`AssertBlobContent(commit[relativeFilepath], "nulltoken\n");`
`588`	`588`
`589`		`- AssertCommitSignaturesAre(commit, Constants.Signature);`
	`589`	`+ AssertCommitIdentitiesAre(commit, Constants.Identity);`
`590`	`590`	`}`
`591`	`591`	`}`
`592`	`592`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public void CreatingANoteWhichAlreadyExistsOverwritesThePreviousNote()`
`168`	`168`	`[Fact]`
`169`	`169`	`public void CanAddANoteWithSignatureFromConfig()`
`170`	`170`	`{`
`171`		`- string configPath = CreateConfigurationWithDummyUser(Constants.Signature);`
	`171`	`+ string configPath = CreateConfigurationWithDummyUser(Constants.Identity);`
`172`	`172`	`var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };`
`173`	`173`	`string path = SandboxBareTestRepo();`
`174`	`174`
`@@ -183,7 +183,7 @@ public void CanAddANoteWithSignatureFromConfig()`
`183`	`183`	`Assert.Equal("I'm batman!\n", newNote.Message);`
`184`	`184`	`Assert.Equal("batmobile", newNote.Namespace);`
`185`	`185`
`186`		`- AssertCommitSignaturesAre(repo.Lookup<Commit>("refs/notes/batmobile"), Constants.Signature);`
	`186`	`+ AssertCommitIdentitiesAre(repo.Lookup<Commit>("refs/notes/batmobile"), Constants.Identity);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`@@ -265,7 +265,7 @@ public void RemovingANonExistingNoteDoesntThrow()`
`265`	`265`	`[Fact]`
`266`	`266`	`public void CanRemoveANoteWithSignatureFromConfig()`
`267`	`267`	`{`
`268`		`- string configPath = CreateConfigurationWithDummyUser(Constants.Signature);`
	`268`	`+ string configPath = CreateConfigurationWithDummyUser(Constants.Identity);`
`269`	`269`	`RepositoryOptions options = new RepositoryOptions() { GlobalConfigurationLocation = configPath };`
`270`	`270`	`string path = SandboxBareTestRepo();`
`271`	`271`
`@@ -280,7 +280,7 @@ public void CanRemoveANoteWithSignatureFromConfig()`
`280`	`280`
`281`	`281`	`Assert.Empty(notes);`
`282`	`282`
`283`		`- AssertCommitSignaturesAre(repo.Lookup<Commit>("refs/notes/" + repo.Notes.DefaultNamespace), Constants.Signature);`
	`283`	`+ AssertCommitIdentitiesAre(repo.Lookup<Commit>("refs/notes/" + repo.Notes.DefaultNamespace), Constants.Identity);`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`