Skip to content

Commit f07d107

Browse files
arturcicBi0T1N
arturcic
authored and
Bi0T1N
committed
GitToolsTestingExtensions => GitRepositoryTestingExtensions
1 parent dc4028f commit f07d107

9 files changed

+37
-37
lines changed

‎src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs renamed to ‎src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace GitVersion.Core.Tests;
1414

15-
public static class GitToolsTestingExtensions
15+
public static class GitRepositoryTestingExtensions
1616
{
1717
private static int commitCount = 1;
1818
private static readonly DateTimeOffset when = DateTimeOffset.Now;

‎src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ private GitVersionContextBuilder WithBranch(string branchName)
4242

4343
private GitVersionContextBuilder AddBranch(string branchName)
4444
{
45-
var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
46-
var mockBranch = GitToolsTestingExtensions.CreateMockBranch(branchName, mockCommit);
45+
var mockCommit = GitRepositoryTestingExtensions.CreateMockCommit();
46+
var mockBranch = GitRepositoryTestingExtensions.CreateMockBranch(branchName, mockCommit);
4747

4848
this.repository ??= CreateRepository();
4949

@@ -71,8 +71,8 @@ public void Build()
7171

7272
private static IGitRepository CreateRepository()
7373
{
74-
var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
75-
var mockBranch = GitToolsTestingExtensions.CreateMockBranch(TestBase.MainBranch, mockCommit);
74+
var mockCommit = GitRepositoryTestingExtensions.CreateMockCommit();
75+
var mockBranch = GitRepositoryTestingExtensions.CreateMockBranch(TestBase.MainBranch, mockCommit);
7676
var branches = Substitute.For<IBranchCollection>();
7777
branches.MockCollectionReturn(mockBranch);
7878

‎src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void When_getting_configurations_of_a_branch_without_versioning_mode_Give
1414
DeploymentMode versioningMode)
1515
{
1616
// Arrange
17-
var branchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());
17+
var branchMock = GitRepositoryTestingExtensions.CreateMockBranch("main", GitRepositoryTestingExtensions.CreateMockCommit());
1818
var configuration = GitFlowConfigurationBuilder.New
1919
.WithDeploymentMode(versioningMode)
2020
.WithBranch("main", builder => builder.WithDeploymentMode(null))
@@ -38,8 +38,8 @@ public void When_getting_configurations_of_a_branch_with_versioning_mode_Given_f
3838
DeploymentMode versioningMode)
3939
{
4040
// Arrange
41-
var mainBranchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());
42-
var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
41+
var mainBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("main", GitRepositoryTestingExtensions.CreateMockCommit());
42+
var developBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
4343
var configuration = GitFlowConfigurationBuilder.New
4444
.WithDeploymentMode(null)
4545
.WithBranch("main", builder => builder.WithDeploymentMode(versioningMode))
@@ -64,8 +64,8 @@ public void When_getting_configurations_of_a_branch_with_versioning_mode_Given_p
6464
DeploymentMode versioningMode)
6565
{
6666
// Arrange
67-
var mainBranchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());
68-
var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
67+
var mainBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("main", GitRepositoryTestingExtensions.CreateMockCommit());
68+
var developBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
6969
var configuration = GitFlowConfigurationBuilder.New
7070
.WithDeploymentMode(null)
7171
.WithBranch("main", builder => builder.WithDeploymentMode(versioningMode))
@@ -99,8 +99,8 @@ public void When_getting_configurations_of_a_branch_with_versioning_mode_Given_p
9999
public void When_getting_configurations_of_a_branch_with_tag_alpha_Given_branch_which_inherits_from_parent_branch_Then_result_should_have_tag_alpha()
100100
{
101101
// Arrange
102-
var mainBranchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());
103-
var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
102+
var mainBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("main", GitRepositoryTestingExtensions.CreateMockCommit());
103+
var developBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
104104
var configuration = GitFlowConfigurationBuilder.New
105105
.WithBranch("main", builder => builder.WithLabel(string.Empty))
106106
.WithBranch("develop", builder => builder
@@ -126,8 +126,8 @@ public void When_getting_configurations_of_a_branch_with_tag_alpha_Given_branch_
126126
public void When_getting_configurations_of_a_branch_without_tag_Given_branch_which_inherits_from_parent_branch_Then_result_should_have_tag_from_parent()
127127
{
128128
// Arrange
129-
var mainBranchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());
130-
var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
129+
var mainBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("main", GitRepositoryTestingExtensions.CreateMockCommit());
130+
var developBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
131131
var configuration = GitFlowConfigurationBuilder.New
132132
.WithBranch("main", builder => builder.WithLabel(string.Empty))
133133
.WithBranch("develop", builder => builder
@@ -154,7 +154,7 @@ public void When_getting_configurations_of_a_branch_without_tag_Given_branch_whi
154154
public void UsesFirstBranchConfigWhenMultipleMatch(string branchName, IncrementStrategy incrementStrategy, string label)
155155
{
156156
// Arrange
157-
var releaseBranchMock = GitToolsTestingExtensions.CreateMockBranch(branchName, GitToolsTestingExtensions.CreateMockCommit());
157+
var releaseBranchMock = GitRepositoryTestingExtensions.CreateMockBranch(branchName, GitRepositoryTestingExtensions.CreateMockCommit());
158158
var configuration = GitFlowConfigurationBuilder.New
159159
.WithoutBranches()
160160
.WithBranch("release/latest", builder => builder
@@ -188,7 +188,7 @@ public void UsesFirstBranchConfigWhenMultipleMatch(string branchName, IncrementS
188188
public void When_getting_configurations_of_an_orphaned_branch_Given_fallback_configuration_with_increment_inherit_Then_result_should_be_empty()
189189
{
190190
// Arrange
191-
var branchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
191+
var branchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
192192
var configuration = GitFlowConfigurationBuilder.New
193193
.WithIncrement(IncrementStrategy.Inherit)
194194
.WithBranch("develop", builder => builder.WithIncrement(IncrementStrategy.Inherit))
@@ -213,7 +213,7 @@ public void When_getting_configurations_of_an_orphaned_branch_Given_fallback_con
213213
IncrementStrategy fallbackIncrement)
214214
{
215215
// Arrange
216-
var branchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
216+
var branchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
217217
var configuration = GitFlowConfigurationBuilder.New
218218
.WithIncrement(fallbackIncrement)
219219
.WithBranch("develop", builder => builder.WithIncrement(IncrementStrategy.Inherit))
@@ -236,7 +236,7 @@ public void When_getting_configurations_of_an_orphaned_branch_Given_fallback_con
236236
public void When_getting_configurations_of_an_unknown_branch_Given_fallback_and_unknown_configuration_with_increment_inherit_Then_result_should_be_empty()
237237
{
238238
// Arrange
239-
var branchMock = GitToolsTestingExtensions.CreateMockBranch("unknown", GitToolsTestingExtensions.CreateMockCommit());
239+
var branchMock = GitRepositoryTestingExtensions.CreateMockBranch("unknown", GitRepositoryTestingExtensions.CreateMockCommit());
240240
var configuration = GitFlowConfigurationBuilder.New
241241
.WithIncrement(IncrementStrategy.Inherit)
242242
.WithBranch("unknown", builder => builder.WithIncrement(IncrementStrategy.Inherit))
@@ -261,7 +261,7 @@ public void When_getting_configurations_of_an_unknown_branch_Given_fallback_conf
261261
IncrementStrategy fallbackIncrement)
262262
{
263263
// Arrange
264-
var branchMock = GitToolsTestingExtensions.CreateMockBranch("unknown", GitToolsTestingExtensions.CreateMockCommit());
264+
var branchMock = GitRepositoryTestingExtensions.CreateMockBranch("unknown", GitRepositoryTestingExtensions.CreateMockCommit());
265265
var configuration = GitFlowConfigurationBuilder.New
266266
.WithIncrement(fallbackIncrement)
267267
.WithBranch("unknown", builder => builder.WithIncrement(IncrementStrategy.Inherit))
@@ -285,13 +285,13 @@ public void When_getting_configurations_of_an_unknown_branch_Given_fallback_conf
285285
IncrementStrategy fallbackIncrement, IncrementStrategy developIncrement)
286286
{
287287
// Arrange
288-
var unknownBranchMock = GitToolsTestingExtensions.CreateMockBranch("unknown", GitToolsTestingExtensions.CreateMockCommit());
288+
var unknownBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("unknown", GitRepositoryTestingExtensions.CreateMockCommit());
289289
var configuration = GitFlowConfigurationBuilder.New
290290
.WithIncrement(fallbackIncrement)
291291
.WithBranch("develop", builder => builder.WithIncrement(developIncrement))
292292
.Build();
293293
var repositoryStoreMock = Substitute.For<IRepositoryStore>();
294-
var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
294+
var developBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
295295
repositoryStoreMock.GetSourceBranches(unknownBranchMock, configuration, Arg.Any<HashSet<IBranch>>()).Returns([developBranchMock]);
296296

297297
var unitUnderTest = new EffectiveBranchConfigurationFinder(Substitute.For<ILog>(), repositoryStoreMock);
@@ -318,13 +318,13 @@ public void When_getting_configurations_of_an_unknown_branch_Given_fallback_conf
318318
IncrementStrategy fallbackIncrement)
319319
{
320320
// Arrange
321-
var unknownBranchMock = GitToolsTestingExtensions.CreateMockBranch("unknown", GitToolsTestingExtensions.CreateMockCommit());
321+
var unknownBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("unknown", GitRepositoryTestingExtensions.CreateMockCommit());
322322
var configuration = GitFlowConfigurationBuilder.New
323323
.WithIncrement(fallbackIncrement)
324324
.WithBranch("develop", builder => builder.WithIncrement(IncrementStrategy.Inherit))
325325
.Build();
326326
var repositoryStoreMock = Substitute.For<IRepositoryStore>();
327-
var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
327+
var developBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
328328
repositoryStoreMock.GetSourceBranches(unknownBranchMock, configuration, Arg.Any<HashSet<IBranch>>()).Returns([developBranchMock]);
329329

330330
var unitUnderTest = new EffectiveBranchConfigurationFinder(Substitute.For<ILog>(), repositoryStoreMock);
@@ -353,13 +353,13 @@ public void When_getting_configurations_of_an_unknown_branch_Given_fallback_and_
353353
IncrementStrategy developBranchIncrement)
354354
{
355355
// Arrange
356-
var unknownBranchMock = GitToolsTestingExtensions.CreateMockBranch("unknown", GitToolsTestingExtensions.CreateMockCommit());
356+
var unknownBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("unknown", GitRepositoryTestingExtensions.CreateMockCommit());
357357
var configuration = GitFlowConfigurationBuilder.New
358358
.WithIncrement(IncrementStrategy.Inherit)
359359
.WithBranch("develop", builder => builder.WithIncrement(developBranchIncrement))
360360
.Build();
361361
var repositoryStoreMock = Substitute.For<IRepositoryStore>();
362-
var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit());
362+
var developBranchMock = GitRepositoryTestingExtensions.CreateMockBranch("develop", GitRepositoryTestingExtensions.CreateMockCommit());
363363
repositoryStoreMock.GetSourceBranches(Arg.Any<IBranch>(), Arg.Any<GitVersionConfiguration>(), Arg.Any<HashSet<IBranch>>()).Returns([developBranchMock]);
364364

365365
var unitUnderTest = new EffectiveBranchConfigurationFinder(Substitute.For<ILog>(), repositoryStoreMock);

‎src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void VerifyNullGuard()
1818
[Test]
1919
public void WhenCommitShouldExcludeWithReason()
2020
{
21-
var commit = GitToolsTestingExtensions.CreateMockCommit();
21+
var commit = GitRepositoryTestingExtensions.CreateMockCommit();
2222
BaseVersion version = new("dummy", new SemanticVersion(1), commit);
2323
var futureDate = DateTimeOffset.UtcNow.AddYears(1);
2424
var sut = new MinDateVersionFilter(futureDate);
@@ -30,7 +30,7 @@ public void WhenCommitShouldExcludeWithReason()
3030
[Test]
3131
public void WhenShaMismatchShouldNotExclude()
3232
{
33-
var commit = GitToolsTestingExtensions.CreateMockCommit();
33+
var commit = GitRepositoryTestingExtensions.CreateMockCommit();
3434
BaseVersion version = new("dummy", new SemanticVersion(1), commit);
3535
var pastDate = DateTimeOffset.UtcNow.AddYears(-1);
3636
var sut = new MinDateVersionFilter(pastDate);

‎src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ShaVersionFilterTests : TestBase
99
[Test]
1010
public void VerifyNullGuard()
1111
{
12-
var commit = GitToolsTestingExtensions.CreateMockCommit();
12+
var commit = GitRepositoryTestingExtensions.CreateMockCommit();
1313
var sut = new ShaVersionFilter([commit.Sha]);
1414

1515
Should.Throw<ArgumentNullException>(() => sut.Exclude(null!, out _));
@@ -18,7 +18,7 @@ public void VerifyNullGuard()
1818
[Test]
1919
public void WhenShaMatchShouldExcludeWithReason()
2020
{
21-
var commit = GitToolsTestingExtensions.CreateMockCommit();
21+
var commit = GitRepositoryTestingExtensions.CreateMockCommit();
2222
BaseVersion version = new("dummy", new SemanticVersion(1), commit);
2323
var sut = new ShaVersionFilter([commit.Sha]);
2424

@@ -29,7 +29,7 @@ public void WhenShaMatchShouldExcludeWithReason()
2929
[Test]
3030
public void WhenShaMismatchShouldNotExclude()
3131
{
32-
var commit = GitToolsTestingExtensions.CreateMockCommit();
32+
var commit = GitRepositoryTestingExtensions.CreateMockCommit();
3333
BaseVersion version = new("dummy", new SemanticVersion(1), commit);
3434
var sut = new ShaVersionFilter(["mismatched"]);
3535

‎src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfiguredNextVersionVersionStrategyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void ConfiguredNextVersionTestShouldFail(string nextVersion, SemanticVers
8181
contextBuilder.ServicesProvider.ShouldNotBeNull();
8282
var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, ConfiguredNextVersionVersionStrategy>();
8383
var context = contextBuilder.ServicesProvider.GetRequiredService<Lazy<GitVersionContext>>().Value;
84-
var branchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());
84+
var branchMock = GitRepositoryTestingExtensions.CreateMockBranch("main", GitRepositoryTestingExtensions.CreateMockCommit());
8585

8686
strategy.ShouldNotBeNull();
8787
return strategy.GetBaseVersions(context.Configuration.GetEffectiveBranchConfiguration(branchMock)).SingleOrDefault();

‎src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ public void ShouldNotAllowIncrementOfVersion()
1515
{
1616
// When a branch is merged in you want to start building stable packages of that version
1717
// So we shouldn't bump the version
18-
var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
18+
var mockCommit = GitRepositoryTestingExtensions.CreateMockCommit();
1919
mockCommit.Message.Returns("Merge branch 'release-0.1.5'");
2020
mockCommit.Parents.Returns(GetParents(true));
2121

22-
var mockBranch = GitToolsTestingExtensions.CreateMockBranch(MainBranch, mockCommit);
22+
var mockBranch = GitRepositoryTestingExtensions.CreateMockBranch(MainBranch, mockCommit);
2323
var branches = Substitute.For<IBranchCollection>();
2424
branches.MockCollectionReturn(mockBranch);
2525

@@ -154,11 +154,11 @@ public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, strin
154154

155155
private static void AssertMergeMessage(string message, string? expectedVersion, IEnumerable<ICommit?> parents, IReadOnlyDictionary<object, object?>? configuration = null)
156156
{
157-
var commit = GitToolsTestingExtensions.CreateMockCommit();
157+
var commit = GitRepositoryTestingExtensions.CreateMockCommit();
158158
commit.Message.Returns(message);
159159
commit.Parents.Returns(parents);
160160

161-
var mockBranch = GitToolsTestingExtensions.CreateMockBranch(MainBranch, commit, GitToolsTestingExtensions.CreateMockCommit());
161+
var mockBranch = GitRepositoryTestingExtensions.CreateMockBranch(MainBranch, commit, GitRepositoryTestingExtensions.CreateMockCommit());
162162

163163
var mockRepository = Substitute.For<IGitRepository>();
164164
mockRepository.Head.Returns(mockBranch);

‎src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Compile Include="..\GitVersion.Core.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
3232
<Compile Include="..\GitVersion.Core.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
3333
<Compile Include="..\GitVersion.Core.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
34-
<Compile Include="..\GitVersion.Core.Tests\Extensions\GitToolsTestingExtensions.cs" Link="Extensions\GitToolsTestingExtensions.cs" />
34+
<Compile Include="..\GitVersion.Core.Tests\Extensions\GitRepositoryTestingExtensions.cs" Link="Extensions\GitRepositoryTestingExtensions.cs" />
3535
<Compile Include="..\GitVersion.Core.Tests\Extensions\GitVersionVariablesExtensions.cs" Link="Extensions\GitVersionVariablesExtensions.cs" />
3636
<Compile Include="..\GitVersion.Core.Tests\Extensions\MockCollectionExtensions.cs" Link="Extensions\MockCollectionExtensions.cs" />
3737
</ItemGroup>

‎src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs renamed to ‎src/GitVersion.MsBuild.Tests/Helpers/GitRepositoryTestingExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace GitVersion.MsBuild.Tests.Helpers;
88

9-
public static class GitToolsTestingExtensions
9+
public static class GitRepositoryTestingExtensions
1010
{
1111
/// <summary>
1212
/// Simulates running on build server

0 commit comments

Comments
 (0)