Skip to content

Commit 0670410

Browse files
arturcicarturcic
committed
replace Logger with ILog (BuildServers)
1 parent 2ccf14a commit 0670410

30 files changed

+178
-130
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Shouldly;
66
using GitVersion.OutputVariables;
77
using GitVersion.Common;
8+
using GitVersion.Log;
89

910
namespace GitVersionCore.Tests.BuildServers
1011
{
@@ -13,11 +14,13 @@ public class BuildServerBaseTests : TestBase
1314
{
1415

1516
private IEnvironment environment;
17+
private ILog log;
1618

1719
[SetUp]
1820
public void SetUp()
1921
{
2022
environment = new TestEnvironment();
23+
log = new NullLog();
2124
}
2225

2326
[Test]
@@ -39,7 +42,7 @@ public void BuildNumberIsFullSemVer()
3942
var config = new TestEffectiveConfiguration();
4043

4144
var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
42-
new BuildServer(environment).WriteIntegration(writes.Add, variables);
45+
new BuildServer(environment, log).WriteIntegration(writes.Add, variables);
4346

4447
writes[1].ShouldBe("1.2.3-beta.1+5");
4548
}
@@ -48,7 +51,7 @@ class BuildServer : BuildServerBase
4851
{
4952
protected override string EnvironmentVariable { get; }
5053

51-
public BuildServer(IEnvironment environment) : base(environment)
54+
public BuildServer(IEnvironment environment, ILog log) : base(environment, log)
5255
{
5356
}
5457

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
using NUnit.Framework;
22
using GitVersion.BuildServers;
33
using GitVersion.Common;
4+
using GitVersion.Log;
45

56
namespace GitVersionCore.Tests.BuildServers
67
{
78
[TestFixture]
89
public class ContinuaCiTests : TestBase
910
{
1011
private IEnvironment environment;
12+
private ILog log;
1113

1214
[SetUp]
1315
public void SetUp()
1416
{
1517
environment = new TestEnvironment();
18+
log = new NullLog();
1619
}
1720

1821
[Test]
1922
public void GenerateBuildVersion()
2023
{
21-
var versionBuilder = new ContinuaCi(environment);
24+
var versionBuilder = new ContinuaCi(environment, log);
2225
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
2326
var continuaCiVersion = versionBuilder.GenerateSetVersionMessage(vars);
2427
Assert.AreEqual("@@continua[setBuildVersion value='0.0.0-Beta4.7']", continuaCiVersion);

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GitVersion.BuildServers;
22
using GitVersion.Common;
3+
using GitVersion.Log;
34
using NUnit.Framework;
45
using Shouldly;
56

@@ -9,10 +10,12 @@ namespace GitVersionCore.Tests.BuildServers
910
public class DroneTests : TestBase
1011
{
1112
private IEnvironment environment;
13+
private ILog log;
1214

1315
[SetUp]
1416
public void SetUp()
1517
{
18+
log = new NullLog();
1619
environment = new TestEnvironment();
1720
environment.SetEnvironmentVariable("DRONE", "true");
1821
}
@@ -27,7 +30,7 @@ public void TearDown()
2730
public void CanApplyToCurrentContext_ShouldBeTrue_WhenEnvironmentVariableIsSet()
2831
{
2932
// Arrange
30-
var buildServer = new Drone(environment);
33+
var buildServer = new Drone(environment, log);
3134

3235
// Act
3336
var result = buildServer.CanApplyToCurrentContext();
@@ -41,7 +44,7 @@ public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotS
4144
{
4245
// Arrange
4346
environment.SetEnvironmentVariable("DRONE", "");
44-
var buildServer = new Drone(environment);
47+
var buildServer = new Drone(environment, log);
4548

4649
// Act
4750
var result = buildServer.CanApplyToCurrentContext();
@@ -59,7 +62,7 @@ public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
5962
environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "");
6063
environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
6164

62-
var buildServer = new Drone(environment);
65+
var buildServer = new Drone(environment, log);
6366

6467
// Act
6568
var result = buildServer.GetCurrentBranch(false);
@@ -76,7 +79,7 @@ public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNo
7679
environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
7780
environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", droneSourceBranch);
7881

79-
var buildServer = new Drone(environment);
82+
var buildServer = new Drone(environment, log);
8083

8184
// Act
8285
var result = buildServer.GetCurrentBranch(false);
@@ -98,7 +101,7 @@ public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPu
98101
environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
99102
environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);
100103

101-
var buildServer = new Drone(environment);
104+
var buildServer = new Drone(environment, log);
102105

103106
// Act
104107
var result = buildServer.GetCurrentBranch(false);
@@ -118,7 +121,7 @@ public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDro
118121
environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", "");
119122
environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
120123

121-
var buildServer = new Drone(environment);
124+
var buildServer = new Drone(environment, log);
122125

123126
// Act
124127
var result = buildServer.GetCurrentBranch(false);
@@ -142,7 +145,7 @@ public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDro
142145
environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);
143146
environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
144147

145-
var buildServer = new Drone(environment);
148+
var buildServer = new Drone(environment, log);
146149

147150
// Act
148151
var result = buildServer.GetCurrentBranch(false);

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Shouldly;
44
using GitVersion.BuildServers;
55
using GitVersion.Common;
6+
using GitVersion.Log;
67

78
namespace GitVersionCore.Tests.BuildServers
89
{
@@ -12,11 +13,13 @@ public class EnvRunTests : TestBase
1213
private const string EnvVarName = "ENVRUN_DATABASE";
1314
private string mFilePath;
1415
private IEnvironment environment;
16+
private ILog log;
1517

1618
[SetUp]
1719
public void SetEnvironmentVariableForTest()
1820
{
1921
environment = new TestEnvironment();
22+
log = new NullLog();
2023
// set environment variable and create an empty envrun file to indicate that EnvRun is running...
2124
mFilePath = Path.Combine(Path.GetTempPath(), "envrun.db");
2225
environment.SetEnvironmentVariable(EnvVarName, mFilePath);
@@ -33,7 +36,7 @@ public void ClearEnvironmentVariableForTest()
3336
[Test]
3437
public void CanApplyToCurrentContext()
3538
{
36-
EnvRun envrun = new EnvRun(environment);
39+
EnvRun envrun = new EnvRun(environment, log);
3740
bool applys = envrun.CanApplyToCurrentContext();
3841
applys.ShouldBeTrue();
3942
}
@@ -42,7 +45,7 @@ public void CanApplyToCurrentContext()
4245
public void CanApplyToCurrentContext_EnvironmentVariableNotSet()
4346
{
4447
environment.SetEnvironmentVariable(EnvVarName, null);
45-
EnvRun envrun = new EnvRun(environment);
48+
EnvRun envrun = new EnvRun(environment, log);
4649
bool applys = envrun.CanApplyToCurrentContext();
4750
applys.ShouldBeFalse();
4851
}
@@ -51,7 +54,7 @@ public void CanApplyToCurrentContext_EnvironmentVariableNotSet()
5154
[TestCase("1.2.3-rc4")]
5255
public void GenerateSetVersionMessage(string fullSemVer)
5356
{
54-
EnvRun envrun = new EnvRun(environment);
57+
EnvRun envrun = new EnvRun(environment, log);
5558
var vars = new TestableVersionVariables(fullSemVer: fullSemVer);
5659
var version = envrun.GenerateSetVersionMessage(vars);
5760
version.ShouldBe(fullSemVer);
@@ -61,7 +64,7 @@ public void GenerateSetVersionMessage(string fullSemVer)
6164
[TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
6265
public void GenerateSetParameterMessage(string name, string value, string expected)
6366
{
64-
EnvRun envrun = new EnvRun(environment);
67+
EnvRun envrun = new EnvRun(environment, log);
6568
var output = envrun.GenerateSetParameterMessage(name, value);
6669
output.ShouldHaveSingleItem();
6770
output[0].ShouldBe(expected);

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Shouldly;
33
using GitVersion.BuildServers;
44
using GitVersion.Common;
5+
using GitVersion.Log;
56

67
namespace GitVersionCore.Tests.BuildServers
78
{
@@ -13,11 +14,13 @@ public class EnvironmentVariableJenkinsTests : TestBase
1314
string localBranch = "GIT_LOCAL_BRANCH";
1415
string pipelineBranch = "BRANCH_NAME";
1516
private IEnvironment environment;
17+
private ILog log;
1618

1719
[SetUp]
1820
public void SetUp()
1921
{
2022
environment = new TestEnvironment();
23+
log = new NullLog();
2124
}
2225

2326

@@ -35,15 +38,15 @@ private void ClearenvironmentVariableForDetection()
3538
public void CanApplyCurrentContextWhenenvironmentVariableIsSet()
3639
{
3740
SetEnvironmentVariableForDetection();
38-
var j = new Jenkins(environment);
41+
var j = new Jenkins(environment, log);
3942
j.CanApplyToCurrentContext().ShouldBe(true);
4043
}
4144

4245
[Test]
4346
public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
4447
{
4548
ClearenvironmentVariableForDetection();
46-
var j = new Jenkins(environment);
49+
var j = new Jenkins(environment, log);
4750
j.CanApplyToCurrentContext().ShouldBe(false);
4851
}
4952

@@ -58,7 +61,7 @@ public void JenkinsTakesLocalBranchNameNotRemoteName()
5861
environment.SetEnvironmentVariable(branch, "origin/master");
5962

6063
// Test Jenkins that GetCurrentBranch falls back to GIT_BRANCH if GIT_LOCAL_BRANCH undefined
61-
var j = new Jenkins(environment);
64+
var j = new Jenkins(environment, log);
6265
j.GetCurrentBranch(true).ShouldBe("origin/master");
6366

6467
// Set GIT_LOCAL_BRANCH
@@ -87,7 +90,7 @@ public void JenkinsTakesBranchNameInPipelineAsCode()
8790
environment.SetEnvironmentVariable(localBranch, null);
8891

8992
// Test Jenkins GetCurrentBranch method now returns BRANCH_NAME
90-
var j = new Jenkins(environment);
93+
var j = new Jenkins(environment, log);
9194
j.GetCurrentBranch(true).ShouldBe("master");
9295

9396
// Restore environment variables

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Shouldly;
88
using GitVersion.BuildServers;
99
using GitVersion.Common;
10+
using GitVersion.Log;
1011
using GitVersion.OutputVariables;
1112

1213
namespace GitVersionCore.Tests.BuildServers
@@ -15,25 +16,27 @@ namespace GitVersionCore.Tests.BuildServers
1516
public class GitLabCiMessageGenerationTests : TestBase
1617
{
1718
private IEnvironment environment;
19+
private ILog log;
1820

1921
[SetUp]
2022
public void SetUp()
2123
{
2224
environment = new TestEnvironment();
25+
log = new NullLog();
2326
}
2427

2528
[Test]
2629
public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
2730
{
28-
var j = new GitLabCi(environment);
31+
var j = new GitLabCi(environment, log);
2932
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
3033
j.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
3134
}
3235

3336
[Test]
3437
public void GenerateMessageTest()
3538
{
36-
var j = new GitLabCi(environment);
39+
var j = new GitLabCi(environment, log);
3740
var generatedParameterMessages = j.GenerateSetParameterMessage("name", "value");
3841
generatedParameterMessages.Length.ShouldBe(1);
3942
generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
@@ -74,7 +77,7 @@ private void AssertVariablesAreWrittenToFile(string f)
7477

7578
var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
7679

77-
var j = new GitLabCi(environment, f);
80+
var j = new GitLabCi(environment, log, f);
7881

7982
j.WriteIntegration(writes.Add, variables);
8083

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Shouldly;
88
using GitVersion.BuildServers;
99
using GitVersion.Common;
10+
using GitVersion.Log;
1011
using GitVersion.OutputVariables;
1112

1213
namespace GitVersionCore.Tests.BuildServers
@@ -15,25 +16,27 @@ namespace GitVersionCore.Tests.BuildServers
1516
public class JenkinsMessageGenerationTests : TestBase
1617
{
1718
private IEnvironment environment;
19+
private ILog log;
1820

1921
[SetUp]
2022
public void SetUp()
2123
{
2224
environment = new TestEnvironment();
25+
log = new NullLog();
2326
}
2427

2528
[Test]
2629
public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
2730
{
28-
var j = new Jenkins(environment);
31+
var j = new Jenkins(environment, log);
2932
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
3033
j.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
3134
}
3235

3336
[Test]
3437
public void GenerateMessageTest()
3538
{
36-
var j = new Jenkins(environment);
39+
var j = new Jenkins(environment, log);
3740
var generatedParameterMessages = j.GenerateSetParameterMessage("name", "value");
3841
generatedParameterMessages.Length.ShouldBe(1);
3942
generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
@@ -74,7 +77,7 @@ private void AssertVariablesAreWrittenToFile(string f)
7477

7578
var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
7679

77-
var j = new Jenkins(environment, f);
80+
var j = new Jenkins(environment, log, f);
7881

7982
j.WriteIntegration(writes.Add, variables);
8083

0 commit comments

Comments
 (0)