Skip to content

Commit 8f85e61

Browse files
arturcicarturcic
committed
cleanup, renamed MsBuildFixture to MsBuildTaskFixture
made MsBuildTaskFixture.Execute IDisposable
1 parent 65baddc commit 8f85e61

13 files changed

+82
-50
lines changed

‎src/GitVersionCore.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void ShouldCreateFile(string fileExtension)
4747
var variableProvider = sp.GetService<IVariableProvider>();
4848

4949
var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
50-
using var generator = new GitVersionInfoGenerator(fileSystem);
50+
using var generator = sp.GetService<IGitVersionInfoGenerator>();
5151

5252
generator.Execute(variables, new GitVersionInfoContext(directory, fileName, fileExtension));
5353

‎src/GitVersionTask.Tests/GenerateGitVersionInformationTest.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using System.IO;
22
using GitVersion.MSBuildTask.Tasks;
3+
using GitVersion.OutputVariables;
34
using NUnit.Framework;
45
using Shouldly;
56

6-
namespace GitVersion.MSBuildTask.Tests
7+
namespace GitVersionTask.Tests
78
{
89
[TestFixture]
910
public class GenerateGitVersionInformationTest : TestTaskBase
@@ -13,29 +14,37 @@ public void GenerateGitVersionInformationTaskShouldCreateFile()
1314
{
1415
var task = new GenerateGitVersionInformation();
1516

16-
var result = ExecuteMsBuildTask(task);
17+
using var result = ExecuteMsBuildTask(task);
1718

1819
result.Success.ShouldBe(true);
1920
result.Errors.ShouldBe(0);
2021
result.Task.GitVersionInformationFilePath.ShouldNotBeNull();
2122

2223
var fileContent = File.ReadAllText(result.Task.GitVersionInformationFilePath);
23-
fileContent.ShouldContain(@"FullSemVer = ""1.2.4+1""");
24+
fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
25+
fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""2""");
26+
fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""4""");
27+
fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.2.4""");
28+
fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.2.4+1""");
2429
}
2530

2631
[Test]
2732
public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()
2833
{
2934
var task = new GenerateGitVersionInformation();
3035

31-
var result = ExecuteMsBuildTaskInBuildServer(task);
36+
using var result = ExecuteMsBuildTaskInBuildServer(task);
3237

3338
result.Success.ShouldBe(true);
3439
result.Errors.ShouldBe(0);
3540
result.Task.GitVersionInformationFilePath.ShouldNotBeNull();
3641

3742
var fileContent = File.ReadAllText(result.Task.GitVersionInformationFilePath);
38-
fileContent.ShouldContain(@"FullSemVer = ""1.0.1+1""");
43+
fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
44+
fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""0""");
45+
fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""1""");
46+
fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.0.1""");
47+
fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.0.1+1""");
3948
}
4049
}
4150
}

‎src/GitVersionTask.Tests/GetVersionTaskTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using NUnit.Framework;
66
using Shouldly;
77

8-
namespace GitVersion.MSBuildTask.Tests
8+
namespace GitVersionTask.Tests
99
{
1010
[TestFixture]
1111
public class GetVersionTaskTests : TestTaskBase
@@ -28,7 +28,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariables()
2828
{
2929
var task = new GetVersion();
3030

31-
var result = ExecuteMsBuildTask(task);
31+
using var result = ExecuteMsBuildTask(task);
3232

3333
result.Success.ShouldBe(true);
3434
result.Errors.ShouldBe(0);
@@ -44,7 +44,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
4444
{
4545
var task = new GetVersion();
4646

47-
var result = ExecuteMsBuildTaskInBuildServer(task);
47+
using var result = ExecuteMsBuildTaskInBuildServer(task);
4848

4949
result.Success.ShouldBe(true);
5050
result.Errors.ShouldBe(0);

‎src/GitVersionTask.Tests/Helpers/MsBuildExecutionResult.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/GitVersionTask.Tests/Helpers/MsBuildFixture.cs renamed to ‎src/GitVersionTask.Tests/Helpers/MsBuildTaskFixture.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using GitTools.Testing;
45
using GitVersion.BuildAgents;
6+
using GitVersionTask.Tests.Mocks;
57
using Microsoft.Build.Framework;
68

79
namespace GitVersionTask.Tests.Helpers
810
{
9-
public class MsBuildFixture
11+
public class MsBuildTaskFixture
1012
{
13+
private readonly RepositoryFixtureBase fixture;
1114
private KeyValuePair<string, string>[] environmentVariables;
1215

16+
public MsBuildTaskFixture(RepositoryFixtureBase fixture)
17+
{
18+
this.fixture = fixture;
19+
}
20+
1321
public void WithEnv(params KeyValuePair<string, string>[] envs)
1422
{
1523
environmentVariables = envs;
1624
}
1725

18-
public MsBuildExecutionResult<T> Execute<T>(T task) where T : ITask
26+
public MsBuildTaskFixtureResult<T> Execute<T>(T task) where T : ITask
1927
{
2028
return UsingEnv(() =>
2129
{
@@ -25,7 +33,7 @@ public MsBuildExecutionResult<T> Execute<T>(T task) where T : ITask
2533

2634
var result = task.Execute();
2735

28-
return new MsBuildExecutionResult<T>
36+
return new MsBuildTaskFixtureResult<T>(fixture)
2937
{
3038
Success = result,
3139
Task = task,

‎src/GitVersionTask.Tests/Helpers/MsBuildTaskFixtureResult.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System;
2+
using GitTools.Testing;
3+
using Microsoft.Build.Framework;
4+
5+
namespace GitVersionTask.Tests.Helpers
6+
{
7+
public class MsBuildTaskFixtureResult<T> : IDisposable where T : ITask
8+
{
9+
private readonly RepositoryFixtureBase fixture;
10+
11+
public MsBuildTaskFixtureResult(RepositoryFixtureBase fixture)
12+
{
13+
this.fixture = fixture;
14+
}
15+
public bool Success { get; set; }
16+
17+
public T Task { get; set; }
18+
19+
public int Errors { get; set; }
20+
public int Warnings { get; set; }
21+
public int Messages { get; set; }
22+
public string Log { get; set; }
23+
24+
public void Dispose()
25+
{
26+
fixture.Dispose();
27+
}
28+
}
29+
}

‎src/GitVersionTask.Tests/InvalidFileCheckerTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System;
22
using System.IO;
3-
using GitVersion.MSBuildTask.Tests.Mocks;
3+
using GitVersion;
4+
using GitVersion.MSBuildTask;
45
using GitVersionCore.Tests.Helpers;
6+
using GitVersionTask.Tests.Mocks;
57
using Microsoft.Build.Framework;
68
using NUnit.Framework;
79

8-
namespace GitVersion.MSBuildTask.Tests
10+
namespace GitVersionTask.Tests
911
{
1012
[TestFixture]
1113
public class InvalidFileCheckerTests : TestBase

‎src/GitVersionTask.Tests/Mocks/MockEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.Build.Framework;
88
using Shouldly;
99

10-
namespace GitVersionTask.Tests
10+
namespace GitVersionTask.Tests.Mocks
1111
{
1212
internal sealed class MockEngine : IBuildEngine4
1313
{

‎src/GitVersionTask.Tests/Mocks/MockTaskItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections;
33
using Microsoft.Build.Framework;
44

5-
namespace GitVersion.MSBuildTask.Tests.Mocks
5+
namespace GitVersionTask.Tests.Mocks
66
{
77
internal class MockTaskItem : ITaskItem
88
{

‎src/GitVersionTask.Tests/TestTaskBase.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
using System.Linq;
33
using GitTools.Testing;
44
using GitVersion.BuildAgents;
5+
using GitVersion.MSBuildTask;
56
using GitVersionCore.Tests.Helpers;
67
using GitVersionTask.Tests.Helpers;
78
using LibGit2Sharp;
89

9-
namespace GitVersion.MSBuildTask.Tests
10+
namespace GitVersionTask.Tests
1011
{
1112
public class TestTaskBase : TestBase
1213
{
@@ -16,21 +17,21 @@ public class TestTaskBase : TestBase
1617
{ "BUILD_SOURCEBRANCH", null }
1718
};
1819

19-
protected static MsBuildExecutionResult<T> ExecuteMsBuildTask<T>(T task) where T : GitVersionTaskBase
20+
protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTask<T>(T task) where T : GitVersionTaskBase
2021
{
21-
using var fixture = CreateLocalRepositoryFixture();
22+
var fixture = CreateLocalRepositoryFixture();
2223
task.SolutionDirectory = fixture.RepositoryPath;
2324

24-
var msbuildFixture = new MsBuildFixture();
25+
var msbuildFixture = new MsBuildTaskFixture(fixture);
2526
return msbuildFixture.Execute(task);
2627
}
2728

28-
protected static MsBuildExecutionResult<T> ExecuteMsBuildTaskInBuildServer<T>(T task) where T : GitVersionTaskBase
29+
protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTaskInBuildServer<T>(T task) where T : GitVersionTaskBase
2930
{
30-
using var fixture = CreateRemoteRepositoryFixture();
31+
var fixture = CreateRemoteRepositoryFixture();
3132
task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
3233

33-
var msbuildFixture = new MsBuildFixture();
34+
var msbuildFixture = new MsBuildTaskFixture(fixture);
3435
msbuildFixture.WithEnv(env.ToArray());
3536
return msbuildFixture.Execute(task);
3637
}

0 commit comments

Comments
 (0)