move version tests

Author: SimonCropp

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -75,13 +75,16 @@
     <Compile Include="GitHubFlow\ReleaseBranchTests.cs" />
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Helpers\NextVersionWriter.cs" />
+    <Compile Include="JsonVersionBuilderTests.cs" />
     <Compile Include="ModuleInitializer.cs" />
     <Compile Include="EmptyRepositoryFixture.cs" />
     <Compile Include="Helpers\GitHelper.cs" />
     <Compile Include="Helpers\PathHelper.cs" />
     <Compile Include="GitHubFlow\MasterTests.cs" />
     <Compile Include="ApprovalTestsConfig.cs" />
     <Compile Include="RepositoryFixtureBase.cs" />
+    <Compile Include="SemanticVersionTests.cs" />
+    <Compile Include="ShortVersionParserTests.cs" />
     <Compile Include="VariableProviderTests.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -95,6 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
+    <Content Include="JsonVersionBuilderTests.Json.approved.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

GitVersionTask.Tests/JsonVersionBuilderTests.Json.approved.txt renamed to GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt

@@ -159,7 +159,7 @@ public void AReleaseBranchIsRequiredToBranchOffOfDevelopBranch()
             File.AppendAllText(path, "Release\n");
 
             repo.Index.Stage(path);
-            var sign = Constants.SignatureNow();
+            var sign = SignatureBuilder.SignatureNow();
             repo.Commit("release unborn", sign, sign);
 
             var feature = repo.Branches[branchName];

GitVersionTask.Tests/JsonVersionBuilderTests.cs renamed to GitVersionCore.Tests/JsonVersionBuilderTests.cs

@@ -85,7 +85,7 @@ static void CreateFakePullRequest(string repoPath, string issueNumber)
             var c = repo.Head.Tip;
             repo.Refs.Add(string.Format("refs/pull/{0}/head", issueNumber), c.Id);
 
-            var sign = Constants.SignatureNow();
+            var sign = SignatureBuilder.SignatureNow();
             var m = repo.ObjectDatabase.CreateCommit(
                 sign, sign,
                 string.Format("Merge pull request #{0} from nulltoken/ntk/fix/{0}", issueNumber)

GitVersionTask.Tests/SemanticVersionTests.cs renamed to GitVersionCore.Tests/SemanticVersionTests.cs

@@ -106,16 +106,13 @@
     <Compile Include="Helpers\LibGit2SharpExtensions.cs" />
     <Compile Include="Helpers\Scrubbers.cs" />
     <Compile Include="Helpers\SelfCleaningDirectory.cs" />
-    <Compile Include="JsonVersionBuilderTests.cs" />
     <Compile Include="GitDirFinderTests.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="SemanticVersionTests.cs" />
-    <Compile Include="ShortVersionParserTests.cs" />
     <Compile Include="UpdateAssemblyInfoTests.cs" />
     <Compile Include="VersionOnMasterFinderTests.cs" />
     <Compile Include="Mocks\SignatureBuilder.cs" />
@@ -147,7 +144,6 @@
     <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt" />
     <Content Include="AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt" />
     <Content Include="FodyWeavers.xml" />
-    <Content Include="JsonVersionBuilderTests.Json.approved.txt" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj">

GitVersionTask.Tests/ShortVersionParserTests.cs renamed to GitVersionCore.Tests/ShortVersionParserTests.cs

@@ -1,12 +1,6 @@
-using System;
-using LibGit2Sharp;
-
+
 public static class Constants
 {
     public const string TemporaryReposPath = "TestRepos";
 
-    public static Signature SignatureNow()
-    {
-        return new Signature("A. U. Thor", "[email protected]", DateTimeOffset.Now);
-    }
 }

GitVersionTask.Tests/GitFlow/GitFlowVersionFinderTests.cs

@@ -102,7 +102,7 @@ protected static Commit AddOneCommitToHead(Repository repo, string type)
         var randomFile = Path.Combine(repo.Info.WorkingDirectory, Guid.NewGuid().ToString());
         File.WriteAllText(randomFile, string.Empty);
         repo.Index.Stage(randomFile);
-        var sign = Constants.SignatureNow();
+        var sign = SignatureBuilder.SignatureNow();
         return repo.Commit(type + " commit", sign, sign);
     }
 
@@ -111,7 +111,7 @@ protected static void AddTag(Repository repo, string tagName)
         var randomFile = Path.Combine(repo.Info.WorkingDirectory, Guid.NewGuid().ToString());
         File.WriteAllText(randomFile, string.Empty);
         repo.Index.Stage(randomFile);
-        var sign = Constants.SignatureNow();
+        var sign = SignatureBuilder.SignatureNow();
         repo.ApplyTag(tagName, repo.Head.Tip.Id.Sha, sign, "foo");
     }
 }

GitVersionTask.Tests/GitHelperTests.cs

@@ -7,4 +7,9 @@ public static Signature ToSignature(this DateTimeOffset dateTimeOffset)
     {
         return new Signature("fakeName", "fakeEmail", dateTimeOffset);
     }
+
+    public static Signature SignatureNow()
+    {
+        return new Signature("A. U. Thor", "[email protected]", DateTimeOffset.Now);
+    }
 }