replaced MockRepository with Substitute.For

Author: arturcic

src/GitVersionCore.Tests/Helpers/GitVersionContextBuilder.cs

@@ -7,7 +7,6 @@
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 using GitVersionCore.Tests.Helpers;
-using GitVersionCore.Tests.Mocks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using NSubstitute;
@@ -58,8 +57,7 @@ private GitVersionContextBuilder AddBranch(string branchName)
             var branches = repository.Branches.ToList();
             branches.Add(mockBranch);
             repository.Branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)branches).GetEnumerator());
-
-            ((MockRepository)repository).Head = mockBranch;
+            repository.Head.Returns(mockBranch);
             return this;
         }
 
@@ -91,11 +89,11 @@ private static IGitRepository CreateRepository()
             var mockBranch = GitToolsTestingExtensions.CreateMockBranch("master", mockCommit);
             var branches = Substitute.For<IBranchCollection>();
             branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
-            var mockRepository = new MockRepository
-            {
-                Branches = branches,
-                Head = mockBranch
-            };
+
+            var mockRepository = Substitute.For<IGitRepository>();
+            mockRepository.Branches.Returns(branches);
+            mockRepository.Head.Returns(mockBranch);
+            mockRepository.Commits.Returns(mockBranch.Commits);
 
             return mockRepository;
         }

src/GitVersionCore.Tests/Mocks/MockRepository.cs

@@ -6,7 +6,6 @@
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
-using GitVersionCore.Tests.Mocks;
 using LibGit2Sharp;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -36,11 +35,10 @@ public void CanInheritVersioningMode(VersioningMode mode)
             var branches = Substitute.For<IBranchCollection>();
             branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
 
-            var mockRepository = new MockRepository
-            {
-                Head = mockBranch,
-                Branches = branches
-            };
+            var mockRepository = Substitute.For<IGitRepository>();
+            mockRepository.Head.Returns(mockBranch);
+            mockRepository.Branches.Returns(branches);
+            mockRepository.Commits.Returns(mockBranch.Commits);
 
             var context = GetGitVersionContext(fixture.RepositoryPath, mockRepository, branchName, config);
 
@@ -100,11 +98,10 @@ public void UsesBranchSpecificConfigOverTopLevelDefaults()
             var branches = Substitute.For<IBranchCollection>();
             branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { master, develop }).GetEnumerator());
 
-            var mockRepository = new MockRepository
-            {
-                Head = develop,
-                Branches = branches
-            };
+            var mockRepository = Substitute.For<IGitRepository>();
+            mockRepository.Head.Returns(develop);
+            mockRepository.Branches.Returns(branches);
+            mockRepository.Commits.Returns(develop.Commits);
 
             var context = GetGitVersionContext(fixture.RepositoryPath, mockRepository, branchName, config);
 
@@ -144,16 +141,15 @@ public void UsesFirstBranchConfigWhenMultipleMatch()
             var branches = Substitute.For<IBranchCollection>();
             branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { releaseLatestBranch, releaseVersionBranch }).GetEnumerator());
 
-            var mockRepository = new MockRepository
-            {
-                Branches = branches,
-                Head = releaseLatestBranch
-            };
+            var mockRepository = Substitute.For<IGitRepository>();
+            mockRepository.Branches.Returns(branches);
+            mockRepository.Head.Returns(releaseLatestBranch);
+            mockRepository.Commits.Returns(releaseLatestBranch.Commits);
 
             var latestContext = GetGitVersionContext(fixture.RepositoryPath, mockRepository, releaseLatestBranch.CanonicalName, config);
             latestContext.Configuration.Increment.ShouldBe(IncrementStrategy.None);
 
-            mockRepository.Head = releaseVersionBranch;
+            mockRepository.Head.Returns(releaseVersionBranch);
             var versionContext = GetGitVersionContext(fixture.RepositoryPath, mockRepository, releaseVersionBranch.CanonicalName, config);
             versionContext.Configuration.Increment.ShouldBe(IncrementStrategy.Patch);
         }

src/GitVersionCore.Tests/Model/GitVersionContextTests.cs

@@ -5,7 +5,6 @@
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
-using GitVersionCore.Tests.Mocks;
 using NSubstitute;
 using NUnit.Framework;
 using Shouldly;
@@ -28,12 +27,10 @@ public void ShouldNotAllowIncrementOfVersion()
             var branches = Substitute.For<IBranchCollection>();
             branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
 
-            var mockRepository = new MockRepository
-            {
-                Head = mockBranch,
-                Branches = branches,
-                Commits = mockBranch.Commits
-            };
+            var mockRepository = Substitute.For<IGitRepository>();
+            mockRepository.Head.Returns(mockBranch);
+            mockRepository.Branches.Returns(branches);
+            mockRepository.Commits.Returns(mockBranch.Commits);
 
             var contextBuilder = new GitVersionContextBuilder().WithRepository(mockRepository);
             contextBuilder.Build();
@@ -163,12 +160,13 @@ private static void AssertMergeMessage(string message, string expectedVersion, I
 
             var mockBranch = GitToolsTestingExtensions.CreateMockBranch("master", commit, GitToolsTestingExtensions.CreateMockCommit());
 
+            var mockRepository = Substitute.For<IGitRepository>();
+            mockRepository.Head.Returns(mockBranch);
+            mockRepository.Commits.Returns(mockBranch.Commits);
+
             var contextBuilder = new GitVersionContextBuilder()
                 .WithConfig(config ?? new Config())
-                .WithRepository(new MockRepository
-                {
-                    Head = mockBranch
-                });
+                .WithRepository(mockRepository);
             contextBuilder.Build();
             var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, MergeMessageVersionStrategy>();