Moved test from LastVersionOnMasterFinderTests to SupportBranchScenarios and deleted other tests which are covered elsewhere

Author: JakeGinnivan

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -80,6 +80,7 @@
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Helpers\NextVersionWriter.cs" />
     <Compile Include="InformationalVersionBuilderTests.cs" />
+    <Compile Include="IntegrationTests\GitHubFlow\SupportBranchScenarios.cs" />
     <Compile Include="JsonVersionBuilderTests.cs" />
     <Compile Include="LastVersionOnMasterFinderTests.cs" />
     <Compile Include="ModuleInitializer.cs" />

GitVersionCore.Tests/IntegrationTests/GitHubFlow/SupportBranchScenarios.cs

@@ -1,5 +1,6 @@
 namespace GitVersionCore.Tests.IntegrationTests.GitHubFlow
 {
+    using System;
     using GitVersion;
     using LibGit2Sharp;
     using NUnit.Framework;
@@ -50,6 +51,31 @@ public void SupportIsCalculatedCorrectly()
                 fixture.Repository.MergeNoFF("hotfix/1.2.1");
                 fixture.AssertFullSemver("1.2.1+2");
             }
-        } 
+        }
+
+
+
+        [Test]
+        public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed()
+        {
+            using (var fixture = new EmptyRepositoryFixture(new Config()))
+            {
+                fixture.Repository.MakeACommit();
+                fixture.Repository.CreateBranch("Support-1.2.0");
+                fixture.Repository.Checkout("Support-1.2.0");
+                fixture.Repository.MakeACommit();
+                fixture.Repository.ApplyTag("1.2.0");
+
+                fixture.Repository.CreateBranch("Support-1.3.0");
+                fixture.Repository.Checkout("Support-1.3.0");
+                fixture.Repository.ApplyTag("1.3.0");
+
+                //Move On
+                fixture.Repository.MakeACommit();
+                fixture.Repository.MakeACommit();
+
+                fixture.AssertFullSemver("1.3.1+2");
+            }
+        }
     }
 }

GitVersionCore.Tests/LastVersionOnMasterFinderTests.cs

@@ -7,80 +7,6 @@
 [TestFixture]
 public class LastVersionOnMasterFinderTests
 {
-    
-    [Test]
-    public void WhenMasterHasPatchTagEnsureLastMinorTagIsUsed()
-    {
-        using (var fixture = new EmptyRepositoryFixture(new Config()))
-        {
-            var stamp = new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero);
-            fixture.Repository.MakeACommit(stamp);
-            fixture.Repository.ApplyTag("1.2.0");
-            fixture.Repository.MakeACommit(stamp); 
-            fixture.Repository.ApplyTag("1.2.1");
-            fixture.Repository.MakeACommit();
-
-            var dateTimeOffset = LastMinorVersionFinder.Execute(fixture.Repository, fixture.Repository.Head.Tip);
-            Assert.AreEqual(stamp,dateTimeOffset);
-        }
-    }
-
-    [Test]
-    public void WhenNoTagsOrMergeCommitsShouldUseFirstCommit()
-    {
-        using (var fixture = new EmptyRepositoryFixture(new Config()))
-        {
-            var stamp = new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero);
-            fixture.Repository.MakeACommit(stamp);
-
-            var dateTimeOffset = LastMinorVersionFinder.Execute(fixture.Repository, fixture.Repository.Head.Tip);
-            Assert.AreEqual(stamp,dateTimeOffset);
-        }
-    }
-    [Test]
-    public void WhenSupportIsBranchedFromMasterEnsureLastMinorTagIsUsed()
-    {
-        using (var fixture = new EmptyRepositoryFixture(new Config()))
-        {
-            var stamp = new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero);
-            fixture.Repository.MakeACommit(stamp);
-            fixture.Repository.ApplyTag("1.2.0");
-            fixture.Repository.CreateBranch("Support-1.2.0");
-            fixture.Repository.Checkout("Support-1.2.0");
-            fixture.Repository.MakeACommit();
-            
-            var dateTimeOffset = LastMinorVersionFinder.Execute(fixture.Repository, fixture.Repository.Head.Tip);
-            Assert.AreEqual(stamp,dateTimeOffset);
-        }
-    }
-
-    [Test]
-    public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed()
-    {
-        using (var fixture = new EmptyRepositoryFixture(new Config()))
-        {
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("Support-1.2.0");
-            fixture.Repository.Checkout("Support-1.2.0");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.ApplyTag("1.2.0");
-
-            fixture.Repository.CreateBranch("Support-1.3.0");
-            fixture.Repository.Checkout("Support-1.3.0");
-            var stamp = new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero);
-            var commit = fixture.Repository.MakeACommit(stamp);
-            fixture.Repository.ApplyTag("1.3.0", commit.Sha);
-
-            //Move On
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-
-            
-            var dateTimeOffset = LastMinorVersionFinder.Execute(fixture.Repository, fixture.Repository.Head.Tip);
-            Assert.AreEqual(stamp,dateTimeOffset);
-        }
-    }
-    
     /*
          *  hotfix-1.2.1       -----------C--      
          *                    /              \