cleanup

Author: arturcic

src/GitVersion.LibGit2Sharp/Git/Commit.cs

@@ -51,7 +51,7 @@ public virtual IObjectId Id
             }
         }
 
-        public virtual DateTimeOffset? CommitterWhen => innerObjectId.Committer.When;
+        public virtual DateTimeOffset CommitterWhen => innerObjectId.Committer.When;
         public virtual string Message => innerObjectId.Message;
     }
 }

src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs

@@ -13,7 +13,7 @@ protected ReferenceCollection()
         {
         }
 
-        public IEnumerator<IReference> GetEnumerator()
+        public virtual IEnumerator<IReference> GetEnumerator()
         {
             return innerCollection.Select(reference => new Reference(reference)).GetEnumerator();
         }

src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs

@@ -68,122 +68,43 @@ private static void EnsureLocalBranchExistsForCurrentBranch(IGitRepository repo,
         public void EnsureLocalBranchExistsForCurrentBranch_CaseInsensitivelyMatchesBranches()
         {
             var log = Substitute.For<ILog>();
-            var repository = MockRepository();
+            var repository = Substitute.For<IGitRepository>();
             var remote = MockRemote(repository);
 
             EnsureLocalBranchExistsForCurrentBranch(repository, log, remote, "refs/heads/featurE/feat-test");
         }
 
-        private static IGitRepository MockRepository()
-        {
-            var repository = Substitute.For<IGitRepository>();
-            return repository;
-        }
-
         private static IRemote MockRemote(IGitRepository repository)
         {
-            var branches = new TestableBranchCollection();
-            var tipId = new ObjectId("c6d8764d20ff16c0df14c73680e52b255b608926");
-            var tip = new TestableCommit(tipId);
-            var head = branches.Add("refs/heads/feature/feat-test", tip);
-            var remote = new TesatbleRemote("origin");
-            var references = new TestableReferenceCollection
-            {
-                {
-                    "develop", "refs/heads/develop"
-                }
-            };
-
-            repository.Refs.Returns(references);
-            repository.Head.Returns(head);
-            repository.Branches.Returns(branches);
-            return remote;
-        }
-
-        private class TestableBranchCollection : BranchCollection
-        {
-            private IDictionary<string, IBranch> branches = new Dictionary<string, IBranch>();
+            var tipId = Substitute.For<IObjectId>();
+            tipId.Sha.Returns("c6d8764d20ff16c0df14c73680e52b255b608926");
 
-            public override IBranch this[string name] =>
-                branches.ContainsKey(name)
-                    ? branches[name]
-                    : null;
+            var tip = Substitute.For<ICommit>();
+            tip.Id.Returns(tipId);
+            tip.Sha.Returns(tipId.Sha);
 
-            public IBranch Add(string name, ICommit commit)
-            {
-                var branch = new TestableBranch(name, commit);
-                branches.Add(name, branch);
-                return branch;
-            }
+            var remote = Substitute.For<IRemote>();
+            remote.Name.Returns("origin");
 
-            public override IEnumerator<IBranch> GetEnumerator()
-            {
-                return branches.Values.GetEnumerator();
-            }
-        }
+            var branch = Substitute.For<IBranch>();
+            branch.Tip.Returns(tip);
+            branch.CanonicalName.Returns("refs/heads/feature/feat-test");
 
-        private class TestableBranch : Branch
-        {
-            private readonly string canonicalName;
-            private readonly ICommit tip;
+            var branches = Substitute.For<IBranchCollection>();
+            branches[branch.CanonicalName].Returns(branch);
+            branches.GetEnumerator().Returns(x => ((IEnumerable<IBranch>)new[] { branch }).GetEnumerator());
 
-            public TestableBranch(string canonicalName, ICommit tip)
-            {
-                this.tip = tip;
-                this.canonicalName = canonicalName;
-            }
-
-            public override string CanonicalName => canonicalName;
-            public override ICommit Tip => tip;
-        }
+            var reference = Substitute.For<IReference>();
+            reference.CanonicalName.Returns("refs/heads/develop");
 
-        private class TestableCommit : Commit
-        {
-            private IObjectId id;
+            var references = Substitute.For<IReferenceCollection>();
+            references["develop"].Returns(reference);
+            references.GetEnumerator().Returns(x => ((IEnumerable<IReference>)new[] { reference }).GetEnumerator());
 
-            public TestableCommit(IObjectId id)
-            {
-                this.id = id;
-            }
-
-            public override IObjectId Id => id;
-            public override string Sha => id.Sha;
-        }
-
-        private class TesatbleRemote : Remote
-        {
-            private string name;
-
-            public TesatbleRemote(string name)
-            {
-                this.name = name;
-            }
-
-            public override string Name => name;
-        }
-
-        private class TestableReferenceCollection : ReferenceCollection
-        {
-            private IReference reference;
-            public override void Add(string name, string canonicalRefNameOrObjectish, bool allowOverwrite = false)
-            {
-                reference = new TestableReference(canonicalRefNameOrObjectish);
-            }
-            public override void UpdateTarget(IReference directRef, IObjectId targetId)
-            {
-            }
-            public override IReference this[string name] => reference;
-        }
-
-        private class TestableReference : Reference
-        {
-
-            public TestableReference(string canonicalName)
-            {
-                this.CanonicalName = canonicalName;
-            }
-
-            public override string CanonicalName { get; }
+            repository.Refs.Returns(references);
+            repository.Head.Returns(branch);
+            repository.Branches.Returns(branches);
+            return remote;
         }
     }
 }

src/GitVersionCore.Tests/IntegrationTests/IgnoreBeforeScenarios.cs

@@ -1,8 +1,10 @@
+using System;
 using GitTools.Testing;
 using GitVersion;
 using GitVersion.Configuration;
 using GitVersion.Model.Configuration;
 using GitVersionCore.Tests.Helpers;
+using NSubstitute;
 using NUnit.Framework;
 
 namespace GitVersionCore.Tests.IntegrationTests
@@ -14,14 +16,17 @@ public class IgnoreBeforeScenarios : TestBase
         public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored()
         {
             using var fixture = new EmptyRepositoryFixture();
-            var commit = new Commit(fixture.Repository.MakeACommit());
+            var objectId = fixture.Repository.MakeACommit();
+            var commit = Substitute.For<ICommit>();
+            commit.Sha.Returns(objectId.Sha);
+            commit.CommitterWhen.Returns(DateTimeOffset.Now);
 
             var config = new ConfigurationBuilder()
                 .Add(new Config
                 {
                     Ignore = new IgnoreConfig
                     {
-                        Before = commit.CommitterWhen.Value.AddMinutes(1)
+                        Before = commit.CommitterWhen.AddMinutes(1)
                     }
                 }).Build();
 

src/GitVersionCore.Tests/Mocks/MockCommit.cs

@@ -28,7 +28,7 @@ public MockCommit()
         public string Message => MessageEx;
 
         public Signature CommitterEx;
-        public DateTimeOffset? CommitterWhen => CommitterEx.When;
+        public DateTimeOffset CommitterWhen => CommitterEx.When;
 
         private readonly IObjectId idEx;
         public IObjectId Id => idEx;

src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

@@ -11,7 +11,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Shouldly;
-using Branch = GitVersion.Branch;
 
 namespace GitVersionCore.Tests.VersionCalculation
 {

src/GitVersionCore/Core/Abstractions/Git/ICommit.cs

@@ -8,7 +8,7 @@ public interface ICommit : IEquatable<ICommit>, IComparable<ICommit>
         IEnumerable<ICommit> Parents { get; }
         string Sha { get; }
         IObjectId Id { get; }
-        DateTimeOffset? CommitterWhen { get; }
+        DateTimeOffset CommitterWhen { get; }
         string Message { get; }
     }
 }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs

@@ -24,7 +24,7 @@ public MergeMessageVersionStrategy(ILog log, Lazy<GitVersionContext> versionCont
 
         public override IEnumerable<BaseVersion> GetVersions()
         {
-            var commitsPriorToThan = Context.CurrentBranch.Commits.GetCommitsPriorTo(Context.CurrentCommit.CommitterWhen.Value);
+            var commitsPriorToThan = Context.CurrentBranch.Commits.GetCommitsPriorTo(Context.CurrentCommit.CommitterWhen);
             var baseVersions = commitsPriorToThan
                 .SelectMany(c =>
                 {

src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs

@@ -96,7 +96,7 @@ public SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit baseVersi
                 context.CurrentBranch.FriendlyName,
                 context.CurrentCommit.Sha,
                 shortSha,
-                context.CurrentCommit.CommitterWhen.Value,
+                context.CurrentCommit.CommitterWhen,
                 context.NumberOfUncommittedChanges);
         }