Skip to content

Commit 456bb58

Browse files
arturcicarturcic
committed
code cleanup
1 parent 1b2a48b commit 456bb58

File tree

5 files changed

+30
-56
lines changed

5 files changed

+30
-56
lines changed

‎src/GitVersionTask.Tests/GenerateGitVersionInformationTest.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System.Collections.Generic;
21
using System.IO;
3-
using System.Linq;
4-
using GitVersion.BuildServers;
52
using GitVersion.MSBuildTask.Tasks;
6-
using GitVersionTask.Tests.Helpers;
73
using NUnit.Framework;
84
using Shouldly;
95

@@ -23,8 +19,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFile()
2319
ProjectFile = fixture.RepositoryPath,
2420
};
2521

26-
var msbuildFixture = new MsBuildFixture();
27-
var result = msbuildFixture.Execute(task);
22+
var result = ExecuteMsBuildTask(task);
2823

2924
result.Success.ShouldBe(true);
3025
result.Errors.ShouldBe(0);
@@ -45,14 +40,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunningInBuildS
4540
ProjectFile = fixture.LocalRepositoryFixture.RepositoryPath,
4641
};
4742

48-
var env = new Dictionary<string, string>
49-
{
50-
{ AzurePipelines.EnvironmentVariableName, "true" }
51-
};
52-
53-
var msbuildFixture = new MsBuildFixture();
54-
msbuildFixture.WithEnv(env.ToArray());
55-
var result = msbuildFixture.Execute(task);
43+
var result = ExecuteMsBuildTaskInBuildServer(task);
5644

5745
result.Success.ShouldBe(true);
5846
result.Errors.ShouldBe(0);

‎src/GitVersionTask.Tests/GetVersionTaskTests.cs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
using System.Collections.Generic;
21
using System.Linq;
3-
using GitVersion.BuildServers;
42
using GitVersion.MSBuildTask.Tasks;
53
using GitVersion.OutputVariables;
6-
using GitVersionTask.Tests.Helpers;
74
using Microsoft.Build.Framework;
85
using NUnit.Framework;
96
using Shouldly;
@@ -36,8 +33,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariables()
3633
SolutionDirectory = fixture.RepositoryPath,
3734
};
3835

39-
var msbuildFixture = new MsBuildFixture();
40-
var result = msbuildFixture.Execute(task);
36+
var result = ExecuteMsBuildTask(task);
4137

4238
result.Success.ShouldBe(true);
4339
result.Errors.ShouldBe(0);
@@ -54,14 +50,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
5450
SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath,
5551
};
5652

57-
var env = new Dictionary<string, string>
58-
{
59-
{ AzurePipelines.EnvironmentVariableName, "true" }
60-
};
61-
62-
var msbuildFixture = new MsBuildFixture();
63-
msbuildFixture.WithEnv(env.ToArray());
64-
var result = msbuildFixture.Execute(task);
53+
var result = ExecuteMsBuildTaskInBuildServer(task);
6554

6655
result.Success.ShouldBe(true);
6756
result.Errors.ShouldBe(0);

‎src/GitVersionTask.Tests/TestTaskBase.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
using System.Linq;
1+
using System.Collections.Generic;
2+
using System.Linq;
23
using GitTools.Testing;
4+
using GitVersion.BuildServers;
35
using GitVersionCore.Tests.Helpers;
46
using GitVersionTask.Tests.Helpers;
57
using LibGit2Sharp;
8+
using Microsoft.Build.Framework;
69

710
namespace GitVersion.MSBuildTask.Tests
811
{
@@ -30,5 +33,23 @@ protected static RemoteRepositoryFixture CreateRemoteRepositoryFixture()
3033
fixture.InitializeRepo();
3134
return fixture;
3235
}
36+
37+
protected static MsBuildExecutionResult<T> ExecuteMsBuildTask<T>(T task) where T : ITask
38+
{
39+
var msbuildFixture = new MsBuildFixture();
40+
return msbuildFixture.Execute(task);
41+
}
42+
43+
protected static MsBuildExecutionResult<T> ExecuteMsBuildTaskInBuildServer<T>(T task) where T : ITask
44+
{
45+
var env = new Dictionary<string, string>
46+
{
47+
{ AzurePipelines.EnvironmentVariableName, "true" }
48+
};
49+
50+
var msbuildFixture = new MsBuildFixture();
51+
msbuildFixture.WithEnv(env.ToArray());
52+
return msbuildFixture.Execute(task);
53+
}
3354
}
3455
}

‎src/GitVersionTask.Tests/UpdateAssemblyInfoTaskTest.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System.Collections.Generic;
21
using System.IO;
3-
using System.Linq;
4-
using GitVersion.BuildServers;
52
using GitVersion.MSBuildTask.Tasks;
6-
using GitVersionTask.Tests.Helpers;
73
using NUnit.Framework;
84
using Shouldly;
95

@@ -23,8 +19,7 @@ public void UpdateAssemblyInfoTaskShouldCreateFile()
2319
ProjectFile = fixture.RepositoryPath,
2420
};
2521

26-
var msbuildFixture = new MsBuildFixture();
27-
var result = msbuildFixture.Execute(task);
22+
var result = ExecuteMsBuildTask(task);
2823

2924
result.Success.ShouldBe(true);
3025
result.Errors.ShouldBe(0);
@@ -45,14 +40,7 @@ public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunningInBuildServer()
4540
ProjectFile = fixture.LocalRepositoryFixture.RepositoryPath,
4641
};
4742

48-
var env = new Dictionary<string, string>
49-
{
50-
{ AzurePipelines.EnvironmentVariableName, "true" }
51-
};
52-
53-
var msbuildFixture = new MsBuildFixture();
54-
msbuildFixture.WithEnv(env.ToArray());
55-
var result = msbuildFixture.Execute(task);
43+
var result = ExecuteMsBuildTaskInBuildServer(task);
5644

5745
result.Success.ShouldBe(true);
5846
result.Errors.ShouldBe(0);

‎src/GitVersionTask.Tests/WriteVersionInfoTest.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System.Collections.Generic;
2-
using System.Linq;
3-
using GitVersion.BuildServers;
41
using GitVersion.MSBuildTask.Tasks;
5-
using GitVersionTask.Tests.Helpers;
62
using NUnit.Framework;
73
using Shouldly;
84

@@ -21,8 +17,7 @@ public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutputIfNotRun
2117
SolutionDirectory = fixture.RepositoryPath,
2218
};
2319

24-
var msbuildFixture = new MsBuildFixture();
25-
var result = msbuildFixture.Execute(task);
20+
var result = ExecuteMsBuildTask(task);
2621

2722
result.Success.ShouldBe(true);
2823
result.Errors.ShouldBe(0);
@@ -39,14 +34,7 @@ public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutput()
3934
SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath,
4035
};
4136

42-
var env = new Dictionary<string, string>
43-
{
44-
{ AzurePipelines.EnvironmentVariableName, "true" }
45-
};
46-
47-
var msbuildFixture = new MsBuildFixture();
48-
msbuildFixture.WithEnv(env.ToArray());
49-
var result = msbuildFixture.Execute(task);
37+
var result = ExecuteMsBuildTaskInBuildServer(task);
5038

5139
result.Success.ShouldBe(true);
5240
result.Errors.ShouldBe(0);

0 commit comments

Comments
 (0)