Skip to content

Commit 7b173a0

Browse files
arturcicarturcic
committed
adjusted field names, removed underscore
1 parent bc08fbd commit 7b173a0

File tree

83 files changed

+389
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+389
-391
lines changed

‎src/GitVersionCore.Tests/Approved/cs/AssemblyInfoFileUpdaterTests.Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt renamed to ‎src/GitVersionCore.Tests/Approved/cs/AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt

File renamed without changes.

‎src/GitVersionCore.Tests/Approved/fs/AssemblyInfoFileUpdaterTests.Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt renamed to ‎src/GitVersionCore.Tests/Approved/fs/AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt

File renamed without changes.

‎src/GitVersionCore.Tests/Approved/vb/AssemblyInfoFileUpdaterTests.Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt renamed to ‎src/GitVersionCore.Tests/Approved/vb/AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt

File renamed without changes.

‎src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
403403
[TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>\r\n' comment\r\n")]
404404
[Category("NoMono")]
405405
[Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
406-
public void Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
406+
public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
407407
{
408408
var workingDir = Path.GetTempPath();
409409
var assemblyInfoFile = "AssemblyInfo." + fileExtension;

‎src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void ClearEnvironmentVariableForTest()
2929
}
3030

3131
[Test]
32-
public void Develop_branch()
32+
public void DevelopBranch()
3333
{
3434
var versionBuilder = new AzurePipelines(environment, log);
3535
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");

‎src/GitVersionCore.Tests/BuildServers/DroneTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void TearDown()
2727
}
2828

2929
[Test]
30-
public void CanApplyToCurrentContext_ShouldBeTrue_WhenEnvironmentVariableIsSet()
30+
public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
3131
{
3232
// Arrange
3333
var buildServer = new Drone(environment, log);
@@ -40,7 +40,7 @@ public void CanApplyToCurrentContext_ShouldBeTrue_WhenEnvironmentVariableIsSet()
4040
}
4141

4242
[Test]
43-
public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotSet()
43+
public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
4444
{
4545
// Arrange
4646
environment.SetEnvironmentVariable("DRONE", "");
@@ -54,7 +54,7 @@ public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotS
5454
}
5555

5656
[Test]
57-
public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
57+
public void GetCurrentBranchShouldDroneBranchInCaseOfPush()
5858
{
5959
// Arrange
6060
const string droneBranch = "droneBranch";
@@ -72,7 +72,7 @@ public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
7272
}
7373

7474
[Test]
75-
public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNonEmptyDroneSourceBranch()
75+
public void GetCurrentBranchShouldUseDroneSourceBranchInCaseOfPullRequestAndNonEmptyDroneSourceBranch()
7676
{
7777
// Arrange
7878
const string droneSourceBranch = "droneSourceBranch";
@@ -89,13 +89,13 @@ public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNo
8989
}
9090

9191
[Test]
92-
public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPullRequestAndEmptyDroneSourceBranch()
92+
public void GetCurrentBranchShouldUseSourceBranchFromCiCommitRefSpecInCaseOfPullRequestAndEmptyDroneSourceBranch()
9393
{
9494
// Arrange
9595
const string droneSourceBranch = "droneSourceBranch";
9696
const string droneDestinationBranch = "droneDestinationBranch";
9797

98-
string ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
98+
var ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
9999

100100
environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
101101
environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
@@ -111,7 +111,7 @@ public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPu
111111
}
112112

113113
[Test]
114-
public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
114+
public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
115115
{
116116
// Arrange
117117
const string droneBranch = "droneBranch";
@@ -131,14 +131,14 @@ public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDro
131131
}
132132

133133
[Test]
134-
public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
134+
public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
135135
{
136136
// Arrange
137137
const string droneBranch = "droneBranch";
138138
const string droneSourceBranch = "droneSourceBranch";
139139
const string droneDestinationBranch = "droneDestinationBranch";
140140

141-
string ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
141+
var ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
142142

143143
environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
144144
environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");

‎src/GitVersionCore.Tests/BuildServers/EnvRunTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,25 @@ public void ClearEnvironmentVariableForTest()
3636
[Test]
3737
public void CanApplyToCurrentContext()
3838
{
39-
EnvRun envrun = new EnvRun(environment, log);
40-
bool applys = envrun.CanApplyToCurrentContext();
39+
var envrun = new EnvRun(environment, log);
40+
var applys = envrun.CanApplyToCurrentContext();
4141
applys.ShouldBeTrue();
4242
}
4343

4444
[Test]
45-
public void CanApplyToCurrentContext_EnvironmentVariableNotSet()
45+
public void CanApplyToCurrentContextEnvironmentVariableNotSet()
4646
{
4747
environment.SetEnvironmentVariable(EnvVarName, null);
48-
EnvRun envrun = new EnvRun(environment, log);
49-
bool applys = envrun.CanApplyToCurrentContext();
48+
var envrun = new EnvRun(environment, log);
49+
var applys = envrun.CanApplyToCurrentContext();
5050
applys.ShouldBeFalse();
5151
}
5252

5353
[TestCase("1.2.3")]
5454
[TestCase("1.2.3-rc4")]
5555
public void GenerateSetVersionMessage(string fullSemVer)
5656
{
57-
EnvRun envrun = new EnvRun(environment, log);
57+
var envrun = new EnvRun(environment, log);
5858
var vars = new TestableVersionVariables(fullSemVer: fullSemVer);
5959
var version = envrun.GenerateSetVersionMessage(vars);
6060
version.ShouldBe(fullSemVer);
@@ -64,7 +64,7 @@ public void GenerateSetVersionMessage(string fullSemVer)
6464
[TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
6565
public void GenerateSetParameterMessage(string name, string value, string expected)
6666
{
67-
EnvRun envrun = new EnvRun(environment, log);
67+
var envrun = new EnvRun(environment, log);
6868
var output = envrun.GenerateSetParameterMessage(name, value);
6969
output.ShouldHaveSingleItem();
7070
output[0].ShouldBe(expected);

‎src/GitVersionCore.Tests/BuildServers/EnvironmentVariableJenkinsTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
5454
public void JenkinsTakesLocalBranchNameNotRemoteName()
5555
{
5656
// Save original values so they can be restored
57-
string branchOrig = environment.GetEnvironmentVariable(branch);
58-
string localBranchOrig = environment.GetEnvironmentVariable(localBranch);
57+
var branchOrig = environment.GetEnvironmentVariable(branch);
58+
var localBranchOrig = environment.GetEnvironmentVariable(localBranch);
5959

6060
// Set GIT_BRANCH for testing
6161
environment.SetEnvironmentVariable(branch, "origin/master");
@@ -79,9 +79,9 @@ public void JenkinsTakesLocalBranchNameNotRemoteName()
7979
public void JenkinsTakesBranchNameInPipelineAsCode()
8080
{
8181
// Save original values so they can be restored
82-
string branchOrig = environment.GetEnvironmentVariable(branch);
83-
string localBranchOrig = environment.GetEnvironmentVariable(localBranch);
84-
string pipelineBranchOrig = environment.GetEnvironmentVariable(pipelineBranch);
82+
var branchOrig = environment.GetEnvironmentVariable(branch);
83+
var localBranchOrig = environment.GetEnvironmentVariable(localBranch);
84+
var pipelineBranchOrig = environment.GetEnvironmentVariable(pipelineBranch);
8585

8686
// Set BRANCH_NAME in pipeline mode
8787
environment.SetEnvironmentVariable(pipelineBranch, "master");

‎src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void SetUp()
3333
}
3434

3535
[Test]
36-
public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
36+
public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
3737
{
3838
var j = new GitLabCi(environment, log);
3939
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");

‎src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void SetUp()
3333
}
3434

3535
[Test]
36-
public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
36+
public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
3737
{
3838
var j = new Jenkins(environment, log);
3939
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");

0 commit comments

Comments
 (0)