Skip to content

Commit 065a34f

Browse files
arturcicarturcic
committed
convert GitVersionVariables to record
1 parent 23e2390 commit 065a34f

File tree

13 files changed

+103
-172
lines changed

13 files changed

+103
-172
lines changed

‎src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void SetEnvironmentVariableForTest()
2828
[Test]
2929
public void DevelopBranch()
3030
{
31-
var vars = new TestableGitVersionVariables(fullSemVer: "0.0.0-Unstable4");
31+
var vars = new TestableGitVersionVariables { FullSemVer = "0.0.0-Unstable4" };
3232
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
3333

3434
vsVersion.ShouldBe("##vso[build.updatebuildnumber]Some Build_Value 0.0.0-Unstable4 20151310.3 $(UnknownVar) Release");
@@ -49,7 +49,7 @@ public void MissingEnvShouldNotBlowUp()
4949
this.environment.SetEnvironmentVariable(key, null);
5050

5151
const string semver = "0.0.0-Unstable4";
52-
var vars = new TestableGitVersionVariables(fullSemVer: semver);
52+
var vars = new TestableGitVersionVariables { FullSemVer = semver };
5353
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
5454
vsVersion.ShouldBe(semver);
5555
}
@@ -61,7 +61,7 @@ public void MissingEnvShouldNotBlowUp()
6161
public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)
6262
{
6363
this.environment.SetEnvironmentVariable(key, buildNumberFormat);
64-
var vars = new TestableGitVersionVariables(fullSemVer: myFullSemVer);
64+
var vars = new TestableGitVersionVariables { FullSemVer = myFullSemVer };
6565
var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
6666
logMessage.ShouldBe(logPrefix + expectedBuildNumber);
6767
}
@@ -73,7 +73,7 @@ public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, st
7373
public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)
7474
{
7575
this.environment.SetEnvironmentVariable(key, buildNumberFormat);
76-
var vars = new TestableGitVersionVariables(semVer: mySemVer);
76+
var vars = new TestableGitVersionVariables { SemVer = mySemVer };
7777
var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
7878
logMessage.ShouldBe(logPrefix + expectedBuildNumber);
7979
}

‎src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void CalculateVersionOnMainBranch()
4141
// Arrange
4242
this.environment.SetEnvironmentVariable(BitBucketPipelines.BranchEnvironmentVariableName, "refs/heads/main");
4343

44-
var vars = new TestableGitVersionVariables(fullSemVer: "1.2.3");
44+
var vars = new TestableGitVersionVariables { FullSemVer = "1.2.3" };
4545
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
4646

4747
vsVersion.ShouldBe("1.2.3");
@@ -53,7 +53,7 @@ public void CalculateVersionOnDevelopBranch()
5353
// Arrange
5454
this.environment.SetEnvironmentVariable(BitBucketPipelines.BranchEnvironmentVariableName, "refs/heads/develop");
5555

56-
var vars = new TestableGitVersionVariables(fullSemVer: "1.2.3-unstable.4");
56+
var vars = new TestableGitVersionVariables { FullSemVer = "1.2.3-unstable.4" };
5757
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
5858

5959
vsVersion.ShouldBe("1.2.3-unstable.4");
@@ -65,7 +65,7 @@ public void CalculateVersionOnFeatureBranch()
6565
// Arrange
6666
this.environment.SetEnvironmentVariable(BitBucketPipelines.BranchEnvironmentVariableName, "refs/heads/feature/my-work");
6767

68-
var vars = new TestableGitVersionVariables(fullSemVer: "1.2.3-beta.4");
68+
var vars = new TestableGitVersionVariables { FullSemVer = "1.2.3-beta.4" };
6969
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
7070

7171
vsVersion.ShouldBe("1.2.3-beta.4");
@@ -139,11 +139,7 @@ private void AssertVariablesAreWrittenToFile(string file)
139139
Minor = 2,
140140
Patch = 3,
141141
PreReleaseTag = "beta1",
142-
BuildMetaData = new SemanticVersionBuildMetaData("5")
143-
{
144-
Sha = "f28807e615e9f06aec8a33c87780374e0c1f6fb8",
145-
CommitDate = new DateTimeOffset(2022, 4, 6, 16, 10, 59, TimeSpan.FromHours(10))
146-
}
142+
BuildMetaData = new SemanticVersionBuildMetaData("5") { Sha = "f28807e615e9f06aec8a33c87780374e0c1f6fb8", CommitDate = new DateTimeOffset(2022, 4, 6, 16, 10, 59, TimeSpan.FromHours(10)) }
147143
};
148144

149145
var configuration = new TestEffectiveConfiguration();

‎src/GitVersion.BuildAgents.Tests/Agents/BuildKiteTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void GetSetParameterMessageShouldReturnEmptyArray()
8686
public void GetEmptyGenerateSetVersionMessage()
8787
{
8888
// Arrange
89-
var vars = new TestableGitVersionVariables("1.0.0");
89+
var vars = new TestableGitVersionVariables { FullSemVer = "1.0.0" };
9090

9191
// Act
9292
var message = this.buildServer.GenerateSetVersionMessage(vars);

‎src/GitVersion.BuildAgents.Tests/Agents/ContinuaCiTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ContinuaCiTests : TestBase
1515
public void GenerateBuildVersion()
1616
{
1717
var buildServer = this.sp.GetRequiredService<ContinuaCi>();
18-
var vars = new TestableGitVersionVariables(fullSemVer: "0.0.0-Beta4.7");
18+
var vars = new TestableGitVersionVariables { FullSemVer = "0.0.0-Beta4.7" };
1919
var continuaCiVersion = buildServer.GenerateSetVersionMessage(vars);
2020
Assert.That(continuaCiVersion, Is.EqualTo("@@continua[setBuildVersion value='0.0.0-Beta4.7']"));
2121
}

‎src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void CanApplyToCurrentContextEnvironmentVariableNotSet()
5151
[TestCase("1.2.3-rc4")]
5252
public void GenerateSetVersionMessage(string fullSemVer)
5353
{
54-
var vars = new TestableGitVersionVariables(fullSemVer: fullSemVer);
54+
var vars = new TestableGitVersionVariables { FullSemVer = fullSemVer };
5555
var version = this.buildServer.GenerateSetVersionMessage(vars);
5656
version.ShouldBe(fullSemVer);
5757
}

‎src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void SkipEmptySetParameterMessage()
123123
public void ShouldWriteIntegration()
124124
{
125125
// Arrange
126-
var vars = new TestableGitVersionVariables("1.0.0");
126+
var vars = new TestableGitVersionVariables { Major = "1.0.0" };
127127

128128
var list = new List<string?>();
129129

@@ -134,21 +134,12 @@ public void ShouldWriteIntegration()
134134
this.buildServer.WriteIntegration(s => list.Add(s), vars);
135135

136136
// Assert
137-
var expected = new List<string>
138-
{
139-
"Executing GenerateSetVersionMessage for 'GitHubActions'.",
140-
"",
141-
"Executing GenerateBuildLogOutput for 'GitHubActions'.",
142-
"Writing version variables to $GITHUB_ENV file for 'GitHubActions'."
143-
};
137+
var expected = new List<string> { "Executing GenerateSetVersionMessage for 'GitHubActions'.", "", "Executing GenerateBuildLogOutput for 'GitHubActions'.", "Writing version variables to $GITHUB_ENV file for 'GitHubActions'." };
144138

145139
string.Join(System.Environment.NewLine, list)
146140
.ShouldBe(string.Join(System.Environment.NewLine, expected));
147141

148-
var expectedFileContents = new List<string>
149-
{
150-
"GitVersion_Major=1.0.0"
151-
};
142+
var expectedFileContents = new List<string> { "GitVersion_Major=1.0.0" };
152143

153144
this.githubSetEnvironmentTempFilePath.ShouldNotBeNull();
154145
var actualFileContents = File.ReadAllLines(this.githubSetEnvironmentTempFilePath);
@@ -160,7 +151,7 @@ public void ShouldWriteIntegration()
160151
public void ShouldNotWriteIntegration()
161152
{
162153
// Arrange
163-
var vars = new TestableGitVersionVariables("1.0.0");
154+
var vars = new TestableGitVersionVariables { FullSemVer = "1.0.0" };
164155

165156
var list = new List<string?>();
166157

@@ -177,7 +168,7 @@ public void ShouldNotWriteIntegration()
177168
public void GetEmptyGenerateSetVersionMessage()
178169
{
179170
// Arrange
180-
var vars = new TestableGitVersionVariables("1.0.0");
171+
var vars = new TestableGitVersionVariables { FullSemVer = "1.0.0" };
181172

182173
// Act
183174
var message = this.buildServer.GenerateSetVersionMessage(vars);

‎src/GitVersion.BuildAgents.Tests/Agents/GitLabCiTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void SetUp()
2121
[Test]
2222
public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
2323
{
24-
var vars = new TestableGitVersionVariables(fullSemVer: "0.0.0-Beta4.7");
24+
var vars = new TestableGitVersionVariables { FullSemVer = "0.0.0-Beta4.7" };
2525
this.buildServer.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
2626
}
2727

@@ -59,11 +59,7 @@ private void AssertVariablesAreWrittenToFile(string file)
5959
Minor = 2,
6060
Patch = 3,
6161
PreReleaseTag = "beta1",
62-
BuildMetaData = new SemanticVersionBuildMetaData("5")
63-
{
64-
Sha = "commitSha",
65-
CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
66-
}
62+
BuildMetaData = new SemanticVersionBuildMetaData("5") { Sha = "commitSha", CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z") }
6763
};
6864

6965
var configuration = new TestEffectiveConfiguration();

‎src/GitVersion.BuildAgents.Tests/Agents/JenkinsTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void JenkinsTakesBranchNameInPipelineAsCode()
9292
[Test]
9393
public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
9494
{
95-
var vars = new TestableGitVersionVariables(fullSemVer: "0.0.0-Beta4.7");
95+
var vars = new TestableGitVersionVariables { FullSemVer = "0.0.0-Beta4.7" };
9696
this.buildServer.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
9797
}
9898

@@ -130,11 +130,7 @@ private void AssertVariablesAreWrittenToFile(string file)
130130
Minor = 2,
131131
Patch = 3,
132132
PreReleaseTag = "beta1",
133-
BuildMetaData = new SemanticVersionBuildMetaData("5")
134-
{
135-
Sha = "commitSha",
136-
CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
137-
}
133+
BuildMetaData = new SemanticVersionBuildMetaData("5") { Sha = "commitSha", CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z") }
138134
};
139135

140136
var configuration = new TestEffectiveConfiguration();

‎src/GitVersion.BuildAgents.Tests/Agents/MyGetTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void SetUp()
1818
[Test]
1919
public void DevelopBranch()
2020
{
21-
var vars = new TestableGitVersionVariables(fullSemVer: "0.0.0-Unstable4");
21+
var vars = new TestableGitVersionVariables { FullSemVer = "0.0.0-Unstable4" };
2222
var message = this.buildServer.GenerateSetVersionMessage(vars);
2323
Assert.That(message, Is.EqualTo(null));
2424
}

‎src/GitVersion.BuildAgents.Tests/Agents/SpaceAutomationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void GetCurrentBranchShouldHandlePullRequests()
8787
public void GetEmptyGenerateSetVersionMessage()
8888
{
8989
// Arrange
90-
var vars = new TestableGitVersionVariables("1.0.0");
90+
var vars = new TestableGitVersionVariables { FullSemVer = "1.0.0" };
9191

9292
// Act
9393
var message = this.buildServer.GenerateSetVersionMessage(vars);

0 commit comments

Comments
 (0)