Skip to content

Commit 2d2da32

Browse files
committed
Fixed failing tests
1 parent a8e6db4 commit 2d2da32

File tree

9 files changed

+38
-34
lines changed

9 files changed

+38
-34
lines changed

src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using GitVersionCore.Tests;
66
using NUnit.Framework;
77
using Shouldly;
8+
using System.Reflection;
89

910
[TestFixture]
1011
public class GitLabCiMessageGenerationTests
@@ -29,8 +30,8 @@ public void GenerateMessageTest()
2930
[Test]
3031
public void WriteAllVariablesToTheTextWriter()
3132
{
32-
// this test method writes to disc, hence marked explicit
33-
var f = "this_file_should_be_deleted.properties";
33+
var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
34+
var f = Path.Combine(assemblyLocation, "this_file_should_be_deleted.properties");
3435

3536
try
3637
{

src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using GitVersionCore.Tests;
66
using NUnit.Framework;
77
using Shouldly;
8+
using System.Reflection;
89

910
[TestFixture]
1011
public class JenkinsMessageGenerationTests
@@ -29,8 +30,8 @@ public void GenerateMessageTest()
2930
[Test]
3031
public void WriteAllVariablesToTheTextWriter()
3132
{
32-
// this test method writes to disc, hence marked explicit
33-
var f = "this_file_should_be_deleted.properties";
33+
var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
34+
var f = Path.Combine(assemblyLocation, "this_file_should_be_deleted.properties");
3435

3536
try
3637
{

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
1313
using (var fixture = new EmptyRepositoryFixture())
1414
{
1515
fixture.Repository.MakeATaggedCommit("1.0.0");
16-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
16+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
1717

1818
fixture.Repository.MakeACommit();
1919
fixture.Repository.MakeACommit();
@@ -31,7 +31,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyNonExistingCommitId()
3131
using (var fixture = new EmptyRepositoryFixture())
3232
{
3333
fixture.Repository.MakeATaggedCommit("1.0.0");
34-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
34+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
3535

3636
fixture.Repository.MakeACommit();
3737
fixture.Repository.MakeACommit();
@@ -49,7 +49,7 @@ public void WhenDevelopBranchedFromTaggedCommitOnMasterVersionDoesNotChange()
4949
using (var fixture = new EmptyRepositoryFixture())
5050
{
5151
fixture.Repository.MakeATaggedCommit("1.0.0");
52-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
52+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
5353
fixture.AssertFullSemver("1.0.0");
5454
}
5555
}
@@ -72,7 +72,7 @@ public void CanChangeDevelopTagViaConfig()
7272
using (var fixture = new EmptyRepositoryFixture())
7373
{
7474
fixture.Repository.MakeATaggedCommit("1.0.0");
75-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
75+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
7676
fixture.Repository.MakeACommit();
7777
fixture.AssertFullSemver(config, "1.1.0-alpha.1");
7878
}
@@ -84,7 +84,7 @@ public void WhenDeveloperBranchExistsDontTreatAsDevelop()
8484
using (var fixture = new EmptyRepositoryFixture())
8585
{
8686
fixture.Repository.MakeATaggedCommit("1.0.0");
87-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("developer"));
87+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("developer"));
8888
fixture.Repository.MakeACommit();
8989
fixture.AssertFullSemver("1.0.1-developer.1+1"); // this tag should be the branch name by default, not unstable
9090
}
@@ -96,7 +96,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
9696
using (var fixture = new EmptyRepositoryFixture())
9797
{
9898
fixture.Repository.MakeATaggedCommit("1.0.0");
99-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
99+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
100100
fixture.Repository.MakeACommit();
101101
fixture.AssertFullSemver("1.1.0-alpha.1");
102102
}
@@ -108,14 +108,14 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel
108108
using (var fixture = new EmptyRepositoryFixture())
109109
{
110110
fixture.Repository.MakeATaggedCommit("1.0.0");
111-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
111+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
112112
fixture.Repository.MakeACommit();
113-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
113+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
114114
fixture.Repository.MakeACommit();
115-
Commands.Checkout(Commands, fixture.Repository, "master");
115+
Commands.Checkout(fixture.Repository, "master");
116116
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
117117

118-
Commands.Checkout(Commands, fixture.Repository, "develop");
118+
Commands.Checkout(fixture.Repository, "develop");
119119
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
120120
fixture.AssertFullSemver("2.1.0-alpha.2");
121121
}
@@ -138,7 +138,7 @@ public void CanHandleContinuousDelivery()
138138
using (var fixture = new EmptyRepositoryFixture())
139139
{
140140
fixture.Repository.MakeATaggedCommit("1.0.0");
141-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
141+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
142142
fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
143143
fixture.AssertFullSemver(config, "1.1.0-alpha.7");
144144
}
@@ -150,11 +150,11 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
150150
using (var fixture = new EmptyRepositoryFixture())
151151
{
152152
fixture.Repository.MakeATaggedCommit("1.0.0");
153-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
153+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
154154
fixture.Repository.MakeACommit();
155155
var commit = fixture.Repository.Head.Tip;
156156
fixture.Repository.MakeACommit();
157-
Commands.Checkout(Commands, fixture.Repository, commit);
157+
Commands.Checkout(fixture.Repository, commit);
158158
fixture.AssertFullSemver("1.1.0-alpha.1");
159159
}
160160
}
@@ -170,7 +170,7 @@ public void InheritVersionFromReleaseBranch()
170170
fixture.BranchTo("release/2.0.0");
171171
fixture.MakeACommit();
172172
fixture.MakeACommit();
173-
Commands.Checkout(fixture, "develop");
173+
fixture.Checkout("develop");
174174
fixture.AssertFullSemver("1.1.0-alpha.1");
175175
fixture.MakeACommit();
176176
fixture.AssertFullSemver("2.1.0-alpha.1");

src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void GivenARemoteGitRepositoryWithCommitsAndBranches_ThenClonedLocalShoul
3535
repo.CreateBranch("develop");
3636
repo.CreateBranch("release-1.0");
3737

38-
repo.Checkout("release-1.0");
38+
Commands.Checkout(repo, "release-1.0");
3939
repo.MakeCommits(5);
4040

4141
return repo;
@@ -68,7 +68,9 @@ public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingExistingIm
6868

6969
using (var fixture = new RemoteRepositoryFixture())
7070
{
71-
fixture.LocalRepositoryFixture.Repository.Checkout(fixture.LocalRepositoryFixture.Repository.Head.Tip);
71+
Commands.Checkout(
72+
fixture.LocalRepositoryFixture.Repository,
73+
fixture.LocalRepositoryFixture.Repository.Head.Tip);
7274

7375
Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository, isForTrackedBranchOnly: false),
7476
string.Format("It looks like the branch being examined is a detached Head pointing to commit '{0}'. Without a proper branch name GitVersion cannot determine the build version.",
@@ -81,7 +83,7 @@ public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingTrackingBr
8183
{
8284
using (var fixture = new RemoteRepositoryFixture())
8385
{
84-
fixture.LocalRepositoryFixture.Repository.Checkout(fixture.LocalRepositoryFixture.Repository.Head.Tip);
86+
Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Head.Tip);
8587

8688
fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository);
8789
}

src/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac
1414
fixture.Repository.MakeCommits(5);
1515
fixture.Repository.MakeATaggedCommit("1.0.0.0");
1616
fixture.Repository.MakeCommits(2);
17-
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
17+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
1818
fixture.AssertFullSemver("1.1.0-alpha.2");
1919
}
2020
}

src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void PreReleaseNumberShouldBeScopeToPreReleaseLabelInContinuousDelivery()
129129

130130
fixture.AssertFullSemver(config, "0.1.0-test.2+2");
131131

132-
Commands.Checkout(Commands, fixture.Repository, "master");
132+
Commands.Checkout(fixture.Repository, "master");
133133
fixture.Repository.Merge(fixture.Repository.FindBranch("feature/test"), Generate.SignatureNow());
134134

135135
fixture.AssertFullSemver(config, "0.1.0-beta.1+2");

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ public void RunExecViaCommandLine()
1818
fixture.MakeATaggedCommit("1.2.3");
1919
fixture.MakeACommit();
2020

21-
var buildFile = Path.Combine(fixture.RepositoryPath, "RunExecViaCommandLine.proj");
21+
var buildFile = Path.Combine(fixture.RepositoryPath, "RunExecViaCommandLine.csproj");
2222
File.Delete(buildFile);
2323
const string buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
24-
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
24+
<Project ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
2525
<Target Name=""OutputResults"">
2626
<Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>
2727
</Target>
2828
</Project>";
2929
File.WriteAllText(buildFile, buildFileContent);
30-
var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, SpecifiedArgumentRunner.BuildTool, "RunExecViaCommandLine.proj /target:OutputResults");
30+
var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, SpecifiedArgumentRunner.BuildTool, "RunExecViaCommandLine.csproj /target:OutputResults");
3131

32-
result.ExitCode.ShouldBe(0);
32+
result.ExitCode.ShouldBe(0, result.Log);
3333
result.Log.ShouldContain("GitVersion_FullSemVer: 1.2.4+1");
3434
}
3535
}
@@ -74,7 +74,7 @@ public void WorkingDirectoryWithoutGitFolderCrashesWithInformativeMessage()
7474
[Description("Doesn't work on Mono/Unix because of the path heuristics that needs to be done there in order to figure out whether the first argument actually is a path.")]
7575
public void WorkingDirectoryDoesNotExistCrashesWithInformativeMessage()
7676
{
77-
var workingDirectory = Path.Combine(Environment.CurrentDirectory, Guid.NewGuid().ToString("N"));
77+
var workingDirectory = Path.Combine(PathHelper.GetCurrentDirectory(), Guid.NewGuid().ToString("N"));
7878
var gitVersion = Path.Combine(PathHelper.GetCurrentDirectory(), "GitVersion.exe");
7979
var output = new StringBuilder();
8080
var exitCode = ProcessHelper.Run(
@@ -83,7 +83,7 @@ public void WorkingDirectoryDoesNotExistCrashesWithInformativeMessage()
8383
null,
8484
gitVersion,
8585
workingDirectory,
86-
Environment.CurrentDirectory);
86+
PathHelper.GetCurrentDirectory());
8787

8888
exitCode.ShouldNotBe(0);
8989
var outputString = output.ToString();

src/GitVersionExe.Tests/MsBuildProjectArgTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void RunsMsBuildProvideViaCommandLineArg()
1717
var buildFile = Path.Combine(fixture.RepositoryPath, "RunsMsBuildProvideViaCommandLineArg.proj");
1818
File.Delete(buildFile);
1919
const string buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
20-
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
20+
<Project ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
2121
<Target Name=""OutputResults"">
2222
<Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>
2323
</Target>

src/GitVersionExe.Tests/PullRequestInTeamCityTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ public void GivenARemoteWithATagOnMaster_AndAPullRequestWithTwoCommits_AndBuildI
2626
remoteRepository.MakeATaggedCommit("1.0.3");
2727

2828
var branch = remoteRepository.CreateBranch("FeatureBranch");
29-
Commands.Checkout(Commands, remoteRepository, branch);
29+
Commands.Checkout(remoteRepository, branch);
3030
remoteRepository.MakeCommits(2);
31-
Commands.Checkout(Commands, remoteRepository, remoteRepository.Head.Tip.Sha);
31+
Commands.Checkout(remoteRepository, remoteRepository.Head.Tip.Sha);
3232
//Emulate merge commit
3333
var mergeCommitSha = remoteRepository.MakeACommit().Sha;
34-
Commands.Checkout(Commands, remoteRepository, "master"); // HEAD cannot be pointing at the merge commit
34+
Commands.Checkout(remoteRepository, "master"); // HEAD cannot be pointing at the merge commit
3535
remoteRepository.Refs.Add(pullRequestRef, new ObjectId(mergeCommitSha));
3636

3737
// Checkout PR commit
3838
Commands.Fetch((Repository)fixture.Repository, "origin", new string[0], new FetchOptions(), null);
39-
Commands.Checkout(Commands, fixture.Repository, mergeCommitSha);
39+
Commands.Checkout(fixture.Repository, mergeCommitSha);
4040
}
4141

4242
var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, isTeamCity: true);

0 commit comments

Comments
 (0)