8000 Favor Identity usage over Signature in tests · github/libgit2sharp@f211cbc · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Feb 3, 2023. It is now read-only.

Commit f211cbc

Browse files
nulltokennulltoken
committed
Favor Identity usage over Signature in tests
1 parent d114368 commit f211cbc

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎LibGit2Sharp.Tests/CommitFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ public void CommitWithInvalidSignatureConfigThrows(string name, string email)
563563
public void CanCommitWithSignatureFromConfig()
564564
{
565565
string repoPath = InitNewRepository();
566-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
566+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
567567
var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
568568

569569
using (var repo = new Repository(repoPath, options))
@@ -586,7 +586,7 @@ public void CanCommitWithSignatureFromConfig()
586586
AssertBlobContent(repo.Head[relativeFilepath], "nulltoken\n");
587587
AssertBlobContent(commit[relativeFilepath], "nulltoken\n");
588588

589-
AssertCommitSignaturesAre(commit, Constants.Signature);
589+
AssertCommitIdentitiesAre(commit, Constants.Identity);
590590
}
591591
}
592592

‎LibGit2Sharp.Tests/ConfigurationFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void CanReadStringValue()
143143
[Fact]
144144
public void CanEnumerateGlobalConfig()
145145
{
146-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
146+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
147147
var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
148148

149149
var path = SandboxStandardTestRepoGitDir();
@@ -200,7 +200,7 @@ public void CanFindInLocalConfig()
200200
[Fact]
201201
public void CanFindInGlobalConfig()
202202
{
203-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
203+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
204204
var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
205205

206206
var path = SandboxStandardTestRepoGitDir();
@@ -387,7 +387,7 @@ public void CanAccessConfigurationWithoutARepository(Func<string, string> localC
387387
{
388388
var path = SandboxStandardTestRepoGitDir();
389389

390-
string globalConfigPath = CreateConfigurationWithDummyUser(Constants.Signature);
390+
string globalConfigPath = CreateConfigurationWithDummyUser(Constants.Identity);
391391
var options = new RepositoryOptions { GlobalConfigurationLocation = globalConfigPath };
392392

393393
using (var repo = new Repository(path, options))

‎LibGit2Sharp.Tests/FilterFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public void CanFilterLargeFiles()
232232
string attributesPath = Path.Combine(Directory.GetParent(repoPath).Parent.FullName, ".gitattributes");
233233
FileInfo attributesFile = new FileInfo(attributesPath);
234234

235-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
235+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
236236
var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
237237

238238
using (Repository repo = new Repository(repoPath, repositoryOptions))
@@ -377,7 +377,7 @@ private static FileInfo StageNewFile(IRepository repo, string contents = "null")
377377

378378
private Repository CreateTestRepository(string path)
379379
{
380-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
380+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
381381
var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
382382
var repository = new Repository(path, repositoryOptions);
383383
CreateAttributesFile(repository, "* filter=test");

‎LibGit2Sharp.Tests/FilterSubstitutionCipherFixture.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void SmugdeIsNotCalledForFileWhichDoesNotMatchAnAttributeEntry()
2121

2222
string repoPath = InitNewRepository();
2323
string fileName = Guid.NewGuid() + ".rot13";
24-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
24+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
2525
var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
2626
using (var repo = new Repository(repoPath, repositoryOptions))
2727
{
@@ -61,7 +61,7 @@ public void CorrectlyEncodesAndDecodesInput()
6161

6262
string repoPath = InitNewRepository();
6363
string fileName = Guid.NewGuid() + ".rot13";
64-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
64+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
6565
var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
6666
using (var repo = new Repository(repoPath, repositoryOptions))
6767
{
@@ -106,7 +106,7 @@ public void WhenStagedFileDoesNotMatchPathSpecFileIsNotFiltered(string pathSpec,
106106
string repoPath = InitNewRepository();
107107
string fileName = Guid.NewGuid() + fileExtension;
108108

109-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
109+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
110110
var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
111111
using (var repo = new Repository(repoPath, repositoryOptions))
112112
{
@@ -141,7 +141,7 @@ public void CleanIsCalledIfAttributeEntryMatches(string filterAttribute, string
141141
string repoPath = InitNewRepository();
142142
string fileName = Guid.NewGuid() + ".txt";
143143

144-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
144+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
145145
var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
146146
using (var repo = new Repository(repoPath, repositoryOptions))
147147
{
@@ -172,7 +172,7 @@ public void SmudgeIsCalledIfAttributeEntryMatches(string filterAttribute, string
172172
string repoPath = InitNewRepository();
173173
string fileName = Guid.NewGuid() + ".txt";
174174

175-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
175+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
176176
var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
177177
using (var repo = new Repository(repoPath, repositoryOptions))
178178
{

‎LibGit2Sharp.Tests/NoteFixture.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void CreatingANoteWhichAlreadyExistsOverwritesThePreviousNote()
168168
[Fact]
169169
public void CanAddANoteWithSignatureFromConfig()
170170
{
171-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
171+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
172172
var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
173173
string path = SandboxBareTestRepo();
174174

@@ -183,7 +183,7 @@ public void CanAddANoteWithSignatureFromConfig()
183183
Assert.Equal("I'm batman!\n", newNote.Message);
184184
Assert.Equal("batmobile", newNote.Namespace);
185185

186-
AssertCommitSignaturesAre(repo.Lookup<Commit>("refs/notes/batmobile"), Constants.Signature);
186+
AssertCommitIdentitiesAre(repo.Lookup<Commit>("refs/notes/batmobile"), Constants.Identity);
187187
}
188188
}
189189

@@ -265,7 +265,7 @@ public void RemovingANonExistingNoteDoesntThrow()
265265
[Fact]
266266
public void CanRemoveANoteWithSignatureFromConfig()
267267
{
268-
string configPath = CreateConfigurationWithDummyUser(Constants.Signature);
268+
string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
269269
RepositoryOptions options = new RepositoryOptions() { GlobalConfigurationLocation = configPath };
270270
string path = SandboxBareTestRepo();
271271

@@ -280,7 +280,7 @@ public void CanRemoveANoteWithSignatureFromConfig()
280280

281281
Assert.Empty(notes);
282282

283-
AssertCommitSignaturesAre(repo.Lookup<Commit>("refs/notes/" + repo.Notes.DefaultNamespace), Constants.Signature);
283+
AssertCommitIdentitiesAre(repo.Lookup<Commit>("refs/notes/" + repo.Notes.DefaultNamespace), Constants.Identity);
284284
}
285285
}
286286

‎LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@ private static RepositoryOptions BuildFakeRepositoryOptions(SelfCleaningDirector
328328
/// Creates a configuration file with user.name and user.email set to signature
329329
/// </summary>
330330
/// <remarks>The configuration file will be removed automatically when the tests are finished</remarks>
331-
/// <param name="signature">The signature to use for user.name and user.email</param>
331+
/// <param name="identity">The identity to use for user.name and user.email</param>
332332
/// <returns>The path to the configuration file</returns>
333-
protected string CreateConfigurationWithDummyUser(Signature signature)
333+
protected string CreateConfigurationWithDummyUser(Identity identity)
334334
{
335-
return CreateConfigurationWithDummyUser(signature.Name, signature.Email);
335+
return CreateConfigurationWithDummyUser(identity.Name, identity.Email);
336336
}
337337

338338
protected string CreateConfigurationWithDummyUser(string name, string email)
@@ -361,13 +361,13 @@ protected string CreateConfigurationWithDummyUser(string name, string email)
361361
/// Asserts that the commit has been authored and committed by the specified signature
362362
/// </summary>
363363
/// <param name="commit">The commit</param>
364-
/// <param name="signature">The signature to compare author and commiter to</param>
365-
protected void AssertCommitSignaturesAre(Commit commit, Signature signature)
364+
/// <param name="identity">The identity to compare author and commiter to</param>
365+
protected void AssertCommitIdentitiesAre(Commit commit, Identity identity)
366366
{
367-
Assert.Equal(signature.Name, commit.Author.Name);
368-
Assert.Equal(signature.Email, commit.Author.Email);
369-
Assert.Equal(signature.Name, commit.Committer.Name);
370-
Assert.Equal(signature.Email, commit.Committer.Email);
367+
Assert.Equal(identity.Name, commit.Author.Name);
368+
Assert.Equal(identity.Email, commit.Author.Email);
369+
Assert.Equal(identity.Name, commit.Committer.Name);
370+
Assert.Equal(identity.Email, commit.Committer.Email);
371371
}
372372

373373
protected static string Touch(string parent, string file, string content = null, Encoding encoding = null)

0 commit comments

Comments
 (0)
0