Skip to content

Commit 4596d98

Browse files
committed
VsoAgentBuildNumberTests refactored with accordance to the remark from @asbjornu
1 parent 7db5467 commit 4596d98

File tree

1 file changed

+18
-34
lines changed

1 file changed

+18
-34
lines changed

src/GitVersionCore.Tests/BuildServers/VsoAgentBuildNumberTests.cs

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,65 +3,49 @@
33
using GitVersionCore.Tests;
44
using NUnit.Framework;
55
using Shouldly;
6-
using System.Collections.Generic;
76

87
[TestFixture]
98
public class VsoAgentBuildNumberTests
109
{
1110
string key = "BUILD_BUILDNUMBER";
1211
string logPrefix = "##vso[build.updatebuildnumber]";
13-
List<Tuple<string, string, string>> examples;
1412
VsoAgent versionBuilder = new VsoAgent();
1513

1614
[SetUp]
1715
public void SetUpVsoAgentBuildNumberTest()
1816
{
19-
examples = new List<Tuple<string, string, string>>();
2017
}
2118

2219
[TearDown]
2320
public void TearDownVsoAgentBuildNumberTest()
2421
{
25-
examples = null;
2622
Environment.SetEnvironmentVariable(key, null, EnvironmentVariableTarget.Process);
2723
}
2824

2925

30-
[Test]
31-
public void VsoAgentBuildNumberWithFullSemVer()
26+
[TestCase("$(GitVersion.FullSemVer)", "1.0.0", "1.0.0")]
27+
[TestCase("$(GITVERSION_FULLSEMVER)", "1.0.0", "1.0.0")]
28+
[TestCase("$(GitVersion.FullSemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
29+
[TestCase("$(GITVERSION_FULLSEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
30+
public void VsoAgentBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)
3231
{
33-
examples.Add(new Tuple<string, string, string>("$(GitVersion.FullSemVer)", "1.0.0", "1.0.0"));
34-
examples.Add(new Tuple<string, string, string>("$(GITVERSION_FULLSEMVER)", "1.0.0", "1.0.0"));
35-
examples.Add(new Tuple<string, string, string>("$(GitVersion.FullSemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234"));
36-
examples.Add(new Tuple<string, string, string>("$(GITVERSION_FULLSEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234"));
37-
38-
foreach (var example in examples)
39-
{
40-
Environment.SetEnvironmentVariable(key, example.Item1, EnvironmentVariableTarget.Process);
41-
var vars = new TestableVersionVariables(fullSemVer: example.Item2);
42-
43-
var logMessage = versionBuilder.GenerateSetVersionMessage(vars);
44-
logMessage.ShouldBe(logPrefix + example.Item3);
45-
}
32+
Environment.SetEnvironmentVariable(key, buildNumberFormat, EnvironmentVariableTarget.Process);
33+
var vars = new TestableVersionVariables(fullSemVer: myFullSemVer);
34+
var logMessage = versionBuilder.GenerateSetVersionMessage(vars);
35+
logMessage.ShouldBe(logPrefix + expectedBuildNumber);
4636
}
4737

4838

49-
[Test]
50-
public void VsoAgentBuildNumberWithSemVer()
39+
[TestCase("$(GitVersion.SemVer)", "1.0.0", "1.0.0")]
40+
[TestCase("$(GITVERSION_SEMVER)", "1.0.0", "1.0.0")]
41+
[TestCase("$(GitVersion.SemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
42+
[TestCase("$(GITVERSION_SEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
43+
public void VsoAgentBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)
5144
{
52-
examples.Add(new Tuple<string, string, string>("$(GitVersion.SemVer)", "1.0.0", "1.0.0"));
53-
examples.Add(new Tuple<string, string, string>("$(GITVERSION_SEMVER)", "1.0.0", "1.0.0"));
54-
examples.Add(new Tuple<string, string, string>("$(GitVersion.SemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234"));
55-
examples.Add(new Tuple<string, string, string>("$(GITVERSION_SEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234"));
56-
57-
foreach (var example in examples)
58-
{
59-
Environment.SetEnvironmentVariable(key, example.Item1, EnvironmentVariableTarget.Process);
60-
var vars = new TestableVersionVariables(semVer: example.Item2);
61-
62-
var logMessage = versionBuilder.GenerateSetVersionMessage(vars);
63-
logMessage.ShouldBe(logPrefix + example.Item3);
64-
}
45+
Environment.SetEnvironmentVariable(key, buildNumberFormat, EnvironmentVariableTarget.Process);
46+
var vars = new TestableVersionVariables(semVer: mySemVer);
47+
var logMessage = versionBuilder.GenerateSetVersionMessage(vars);
48+
logMessage.ShouldBe(logPrefix + expectedBuildNumber);
6549
}
6650

6751
}

0 commit comments

Comments
 (0)