Created some tests around EffectiveConfig

JakeGinnivan · JakeGinnivan · commit f33770981189 · 2015-01-09T12:39:24.000Z
diff --git a/GitVersionCore.Tests/ConfigProviderTests.cs b/GitVersionCore.Tests/ConfigProviderTests.cs
@@ -51,22 +51,6 @@ public void CanReadDocument()
         config.Branches["develop"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
     }
 
-    [Test]
-    public void CanInheritVersioningMode()
-    {
-        const string text = @"
-mode: ContinuousDelivery
-branches:
-    develop:
-        mode: ContinuousDeployment
-";
-        SetupConfigFileContent(text);
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
-        config.Branches["develop"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
-        config.Branches["develop"].Tag.ShouldBe("unstable");
-        config.Branches["release[/-]"].VersioningMode.ShouldBe(VersioningMode.ContinuousDelivery);
-    }
-
     [Test]
     public void CanReadOldDocument()
     {
diff --git a/GitVersionCore.Tests/GitVersionContextTests.cs b/GitVersionCore.Tests/GitVersionContextTests.cs
@@ -0,0 +1,54 @@
+﻿namespace GitVersionCore.Tests
+{
+    using GitVersion;
+    using NUnit.Framework;
+    using Shouldly;
+
+    public class GitVersionContextTests
+    {
+        [Test]
+        [Theory]
+        public void CanInheritVersioningMode(VersioningMode mode)
+        {
+            var config = new Config
+            {
+                VersioningMode = mode
+            };
+
+            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockRepository = new MockRepository
+            {
+                Branches = new MockBranchCollection
+                {
+                    mockBranch
+                }
+            };
+
+            var context = new GitVersionContext(mockRepository, mockBranch, config);
+            context.Configuration.VersioningMode.ShouldBe(mode);
+        }
+
+        [Test]
+        public void UsesBranchSpecificConfigOverTopLevelDefaults()
+        {
+            var config = new Config
+            {
+                VersioningMode = VersioningMode.ContinuousDelivery
+            };
+            config.Branches["develop"].VersioningMode = VersioningMode.ContinuousDeployment;
+            config.Branches["develop"].Tag = "alpha";
+            var develop = new MockBranch("develop") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockRepository = new MockRepository
+            {
+                Branches = new MockBranchCollection
+                {
+                    new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } },
+                    develop
+                }
+            };
+            var context = new GitVersionContext(mockRepository, develop, config);
+            context.Configuration.VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
+            context.Configuration.Tag.ShouldBe("alpha");
+        }
+    }
+}
diff --git a/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -74,6 +74,7 @@
     <Compile Include="Fixtures\RemoteRepositoryFixture.cs" />
     <Compile Include="GitDirFinderTests.cs" />
     <Compile Include="Fixtures\BaseGitFlowRepositoryFixture.cs" />
+    <Compile Include="GitVersionContextTests.cs" />
     <Compile Include="IntegrationTests\RemoteRepositoryTests.cs" />
     <Compile Include="IntegrationTests\GitFlow\DevelopScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\FeatureBranchTests.cs" />
@@ -91,6 +92,18 @@
     <Compile Include="InformationalVersionBuilderTests.cs" />
     <Compile Include="IntegrationTests\GitHubFlow\SupportBranchScenarios.cs" />
     <Compile Include="JsonVersionBuilderTests.cs" />
+    <Compile Include="Mocks\MockBranch.cs" />
+    <Compile Include="Mocks\MockBranchCollection.cs" />
+    <Compile Include="Mocks\MockCommit.cs" />
+    <Compile Include="Mocks\MockCommitLog.cs" />
+    <Compile Include="Mocks\MockMergeCommit.cs" />
+    <Compile Include="Mocks\MockReferenceCollection.cs" />
+    <Compile Include="Mocks\MockReflogCollection.cs" />
+    <Compile Include="Mocks\MockRepository.cs" />
+    <Compile Include="Mocks\MockTag.cs" />
+    <Compile Include="Mocks\MockTagAnnotation.cs" />
+    <Compile Include="Mocks\MockTagCollection.cs" />
+    <Compile Include="Mocks\SignatureBuilder.cs" />
     <Compile Include="ModuleInitializer.cs" />
     <Compile Include="Fixtures\EmptyRepositoryFixture.cs" />
     <Compile Include="Helpers\GitTestExtensions.cs" />
diff --git a/GitVersionCore.Tests/Mocks/MockBranch.cs b/GitVersionCore.Tests/Mocks/MockBranch.cs
@@ -18,7 +18,7 @@ public MockBranch(string name, string canonicalName)
 
     public MockBranch()
     {
-        
+
     }
     MockCommitLog commits = new MockCommitLog();
     string name;
@@ -66,7 +66,7 @@ public bool Remove(Commit item)
         return commits.Remove(item);
     }
 
-    public int Count{get{return commits.Count;}}
+    public int Count { get { return commits.Count; } }
 
-    public bool IsReadOnly { get{return false;} }
+    public bool IsReadOnly { get { return false; } }
 }
diff --git a/GitVersionCore.Tests/Mocks/MockBranchCollection.cs b/GitVersionCore.Tests/Mocks/MockBranchCollection.cs
@@ -13,7 +13,7 @@ public override IEnumerator<Branch> GetEnumerator()
 
     public override Branch this[string name]
     {
-        get { return Branches.FirstOrDefault(x=>x.Name ==name); }
+        get { return Branches.FirstOrDefault(x => x.Name == name); }
     }
 
     public void Add(Branch item)
@@ -40,16 +40,17 @@ public override void Remove(Branch item)
     {
         Branches.Remove(item);
     }
-     bool ICollection<Branch>.Remove(Branch item)
+    bool ICollection<Branch>.Remove(Branch item)
     {
         return Branches.Remove(item);
     }
 
     public int Count
     {
-        get {
+        get
+        {
             return Branches.Count;
         }
     }
-    public bool IsReadOnly { get{return false;}}
+    public bool IsReadOnly { get { return false; } }
 }
diff --git a/GitVersionCore.Tests/Mocks/MockCommit.cs b/GitVersionCore.Tests/Mocks/MockCommit.cs
@@ -4,24 +4,24 @@
 using LibGit2Sharp;
 
 [DebuggerDisplay("{DebuggerDisplay}")]
-public class MockCommit:Commit
+public class MockCommit : Commit
 {
     public MockCommit(ObjectId id = null)
     {
-        idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "")+ "00000000");
+        idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "") + "00000000");
         MessageEx = "";
         ParentsEx = new List<Commit> { null };
         CommitterEx = new Signature("Joe", "Joe@bloggs.net", DateTimeOffset.Now);
     }
 
     public string MessageEx;
-    public override string Message{get { return MessageEx; }}
+    public override string Message { get { return MessageEx; } }
 
     public Signature CommitterEx;
-    public override Signature Committer{get { return CommitterEx; }}
+    public override Signature Committer { get { return CommitterEx; } }
 
     ObjectId idEx;
-    public override ObjectId Id{get { return idEx; }}
+    public override ObjectId Id { get { return idEx; } }
 
     public override string Sha { get { return idEx.Sha; } }
 
@@ -39,4 +39,4 @@ string DebuggerDisplay
             return MessageEx;
         }
     }
-}
+}
diff --git a/GitVersionCore.Tests/Mocks/MockCommitLog.cs b/GitVersionCore.Tests/Mocks/MockCommitLog.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using LibGit2Sharp;
 
-public class MockCommitLog:ICommitLog,ICollection<Commit>
+public class MockCommitLog : ICommitLog, ICollection<Commit>
 {
     public List<Commit> Commits = new List<Commit>();
 
@@ -26,7 +26,7 @@ public void Clear()
     {
         Commits.Clear();
     }
-    
+
 
     public bool Contains(Commit item)
     {
@@ -44,6 +44,8 @@ public bool Remove(Commit item)
     }
 
     public int Count { get { return Commits.Count; } }
-    public bool IsReadOnly {get { return false; } 
+    public bool IsReadOnly
+    {
+        get { return false; }
     }
 }
diff --git a/GitVersionCore.Tests/Mocks/MockMergeCommit.cs b/GitVersionCore.Tests/Mocks/MockMergeCommit.cs
@@ -6,4 +6,4 @@ public MockMergeCommit(ObjectId id = null) : base(id)
     {
         ParentsEx.Add(null);
     }
-}
+}
diff --git a/GitVersionCore.Tests/Mocks/MockReferenceCollection.cs b/GitVersionCore.Tests/Mocks/MockReferenceCollection.cs
@@ -8,9 +8,9 @@ public class MockReferenceCollection : ReferenceCollection, ICollection<Commit>
     public override ReflogCollection Log(string canonicalName)
     {
         return new MockReflogCollection
-               {
-                   Commits = Commits
-               };
+        {
+            Commits = Commits
+        };
     }
 
     public List<Commit> Commits = new List<Commit>();
diff --git a/GitVersionCore.Tests/Mocks/MockReflogCollection.cs b/GitVersionCore.Tests/Mocks/MockReflogCollection.cs
diff --git a/GitVersionCore.Tests/Mocks/MockRepository.cs b/GitVersionCore.Tests/Mocks/MockRepository.cs
@@ -136,4 +136,4 @@ public StashCollection Stashes
     {
         get { throw new NotImplementedException(); }
     }
-}
+}
diff --git a/GitVersionCore.Tests/Mocks/MockTag.cs b/GitVersionCore.Tests/Mocks/MockTag.cs
@@ -1,6 +1,6 @@
 using LibGit2Sharp;
 
-public class MockTag:Tag
+public class MockTag : Tag
 {
 
     public string NameEx;
diff --git a/GitVersionCore.Tests/Mocks/MockTagAnnotation.cs b/GitVersionCore.Tests/Mocks/MockTagAnnotation.cs
@@ -1,6 +1,6 @@
 using LibGit2Sharp;
 
-public class MockTagAnnotation:TagAnnotation
+public class MockTagAnnotation : TagAnnotation
 {
 
     public Signature TaggerEx;
diff --git a/GitVersionCore.Tests/Mocks/MockTagCollection.cs b/GitVersionCore.Tests/Mocks/MockTagCollection.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using LibGit2Sharp;
 
-public class MockTagCollection : TagCollection,ICollection<Tag>
+public class MockTagCollection : TagCollection, ICollection<Tag>
 {
 
     public List<Tag> Tags = new List<Tag>();
diff --git a/GitVersionCore.Tests/Mocks/SignatureBuilder.cs b/GitVersionCore.Tests/Mocks/SignatureBuilder.cs
diff --git a/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -92,6 +92,7 @@
     <Compile Include="BuildServers\MyGetTests.cs" />
     <Compile Include="BuildServers\TeamCityTests.cs" />
     <Compile Include="BuildServers\ContinuaCiTests.cs" />
+    <Compile Include="Mocks\MockBuildEngine.cs" />
     <Compile Include="VersionAndBranchFinderTests.cs" />
     <Compile Include="GitHubFlow\MergedBranchesWithVersionFinderTests.cs" />
     <Compile Include="LambdaEqualityHelperFixture.cs" />
@@ -107,24 +108,11 @@
     <Compile Include="Helpers\SelfCleaningDirectory.cs" />
     <Compile Include="Helpers\Lg2sHelperBase.cs" />
     <Compile Include="LibGitExtensionsTests.cs" />
-    <Compile Include="Mocks\MockBuildEngine.cs" />
-    <Compile Include="Mocks\MockMergeCommit.cs" />
-    <Compile Include="Mocks\MockReflogCollection.cs" />
-    <Compile Include="Mocks\MockTagAnnotation.cs" />
     <Compile Include="UpdateAssemblyInfoTests.cs" />
     <Compile Include="VersionOnMasterFinderTests.cs" />
-    <Compile Include="Mocks\SignatureBuilder.cs" />
-    <Compile Include="Mocks\MockCommitLog.cs" />
-    <Compile Include="Mocks\MockBranch.cs" />
-    <Compile Include="Mocks\MockBranchCollection.cs" />
-    <Compile Include="Mocks\MockCommit.cs" />
-    <Compile Include="Mocks\MockReferenceCollection.cs" />
-    <Compile Include="Mocks\MockRepository.cs" />
     <Compile Include="IntegrationTests.cs" />
     <Compile Include="BranchFinders\MasterTests.cs" />
     <Compile Include="MergeMessageParserTests.cs" />
-    <Compile Include="Mocks\MockTag.cs" />
-    <Compile Include="Mocks\MockTagCollection.cs" />
     <Compile Include="ModuleInitializer.cs" />
     <Compile Include="BranchFinders\FeatureBranchTests.cs" />
     <Compile Include="BranchFinders\PullBranchTests.cs" />

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public MockBranch(string name, string canonicalName)`
`18`	`18`
`19`	`19`	`public MockBranch()`
`20`	`20`	`{`
`21`		`-`
	`21`	`+`
`22`	`22`	`}`
`23`	`23`	`MockCommitLog commits = new MockCommitLog();`
`24`	`24`	`string name;`
`@@ -66,7 +66,7 @@ public bool Remove(Commit item)`
`66`	`66`	`return commits.Remove(item);`
`67`	`67`	`}`
`68`	`68`
`69`		`- public int Count{get{return commits.Count;}}`
	`69`	`+ public int Count { get { return commits.Count; } }`
`70`	`70`
`71`		`- public bool IsReadOnly { get{return false;} }`
	`71`	`+ public bool IsReadOnly { get { return false; } }`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public override IEnumerator<Branch> GetEnumerator()`
`13`	`13`
`14`	`14`	`public override Branch this[string name]`
`15`	`15`	`{`
`16`		`- get { return Branches.FirstOrDefault(x=>x.Name ==name); }`
	`16`	`+ get { return Branches.FirstOrDefault(x => x.Name == name); }`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public void Add(Branch item)`
`@@ -40,16 +40,17 @@ public override void Remove(Branch item)`
`40`	`40`	`{`
`41`	`41`	`Branches.Remove(item);`
`42`	`42`	`}`
`43`		`- bool ICollection<Branch>.Remove(Branch item)`
	`43`	`+ bool ICollection<Branch>.Remove(Branch item)`
`44`	`44`	`{`
`45`	`45`	`return Branches.Remove(item);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public int Count`
`49`	`49`	`{`
`50`		`- get {`
	`50`	`+ get`
	`51`	`+ {`
`51`	`52`	`return Branches.Count;`
`52`	`53`	`}`
`53`	`54`	`}`
`54`		`- public bool IsReadOnly { get{return false;}}`
	`55`	`+ public bool IsReadOnly { get { return false; } }`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,24 +4,24 @@`
`4`	`4`	`using LibGit2Sharp;`
`5`	`5`
`6`	`6`	`[DebuggerDisplay("{DebuggerDisplay}")]`
`7`		`-public class MockCommit:Commit`
	`7`	`+public class MockCommit : Commit`
`8`	`8`	`{`
`9`	`9`	`public MockCommit(ObjectId id = null)`
`10`	`10`	`{`
`11`		`- idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "")+ "00000000");`
	`11`	`+ idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "") + "00000000");`
`12`	`12`	`MessageEx = "";`
`13`	`13`	`ParentsEx = new List<Commit> { null };`
`14`	`14`	`CommitterEx = new Signature("Joe", "[email protected]", DateTimeOffset.Now);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public string MessageEx;`
`18`		`- public override string Message{get { return MessageEx; }}`
	`18`	`+ public override string Message { get { return MessageEx; } }`
`19`	`19`
`20`	`20`	`public Signature CommitterEx;`
`21`		`- public override Signature Committer{get { return CommitterEx; }}`
	`21`	`+ public override Signature Committer { get { return CommitterEx; } }`
`22`	`22`
`23`	`23`	`ObjectId idEx;`
`24`		`- public override ObjectId Id{get { return idEx; }}`
	`24`	`+ public override ObjectId Id { get { return idEx; } }`
`25`	`25`
`26`	`26`	`public override string Sha { get { return idEx.Sha; } }`
`27`	`27`
`@@ -39,4 +39,4 @@ string DebuggerDisplay`
`39`	`39`	`return MessageEx;`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`-}`
	`42`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using LibGit2Sharp;`
`4`	`4`
`5`		`-public class MockCommitLog:ICommitLog,ICollection<Commit>`
	`5`	`+public class MockCommitLog : ICommitLog, ICollection<Commit>`
`6`	`6`	`{`
`7`	`7`	`public List<Commit> Commits = new List<Commit>();`
`8`	`8`
`@@ -26,7 +26,7 @@ public void Clear()`
`26`	`26`	`{`
`27`	`27`	`Commits.Clear();`
`28`	`28`	`}`
`29`		`-`
	`29`	`+`
`30`	`30`
`31`	`31`	`public bool Contains(Commit item)`
`32`	`32`	`{`
`@@ -44,6 +44,8 @@ public bool Remove(Commit item)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public int Count { get { return Commits.Count; } }`
`47`		`- public bool IsReadOnly {get { return false; }`
	`47`	`+ public bool IsReadOnly`
	`48`	`+ {`
	`49`	`+ get { return false; }`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ public MockMergeCommit(ObjectId id = null) : base(id)`
`6`	`6`	`{`
`7`	`7`	`ParentsEx.Add(null);`
`8`	`8`	`}`
`9`		`-}`
	`9`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ public class MockReferenceCollection : ReferenceCollection, ICollection<Commit>`
`8`	`8`	`public override ReflogCollection Log(string canonicalName)`
`9`	`9`	`{`
`10`	`10`	`return new MockReflogCollection`
`11`		`- {`
`12`		`- Commits = Commits`
`13`		`- };`
	`11`	`+ {`
	`12`	`+ Commits = Commits`
	`13`	`+ };`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public List<Commit> Commits = new List<Commit>();`
Original file line number	Diff line number	Diff line change
`@@ -136,4 +136,4 @@ public StashCollection Stashes`
`136`	`136`	`{`
`137`	`137`	`get { throw new NotImplementedException(); }`
`138`	`138`	`}`
`139`		`-}`
	`139`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using LibGit2Sharp;`
`2`	`2`
`3`		`-public class MockTag:Tag`
	`3`	`+public class MockTag : Tag`
`4`	`4`	`{`
`5`	`5`
`6`	`6`	`public string NameEx;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using LibGit2Sharp;`
`2`	`2`
`3`		`-public class MockTagAnnotation:TagAnnotation`
	`3`	`+public class MockTagAnnotation : TagAnnotation`
`4`	`4`	`{`
`5`	`5`
`6`	`6`	`public Signature TaggerEx;`