Skip to content

Commit a077247

Browse files
arturcicarturcic
committed
moving to DI GitVersionFinder, VariableProvider and MetaDataCalculator
1 parent e6c207d commit a077247

35 files changed

+203
-115
lines changed

‎src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using GitVersion;
1111
using GitVersion.Logging;
1212
using GitVersion.SemanticVersioning;
13+
using GitVersion.VersionCalculation;
1314

1415
namespace GitVersionCore.Tests
1516
{
@@ -25,7 +26,7 @@ public void Setup()
2526
{
2627
ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
2728
log = new NullLog();
28-
variableProvider = new VariableProvider(log);
29+
variableProvider = new VariableProvider(log, new MetaDataCalculator());
2930
}
3031

3132
[TestCase("cs")]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using GitVersion;
77
using GitVersion.Logging;
88
using GitVersion.SemanticVersioning;
9+
using GitVersion.VersionCalculation;
910

1011
namespace GitVersionCore.Tests.BuildServers
1112
{
@@ -22,7 +23,7 @@ public void SetUp()
2223
{
2324
environment = new TestEnvironment();
2425
log = new NullLog();
25-
variableProvider = new VariableProvider(log);
26+
variableProvider = new VariableProvider(log, new MetaDataCalculator());
2627
}
2728

2829
[Test]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using GitVersion.OutputVariables;
1010
using GitVersion.Logging;
1111
using GitVersion.SemanticVersioning;
12+
using GitVersion.VersionCalculation;
1213

1314
namespace GitVersionCore.Tests.BuildServers
1415
{
@@ -25,7 +26,7 @@ public void SetUp()
2526
log = new NullLog();
2627

2728
environment = new TestEnvironment();
28-
variableProvider = new VariableProvider(log);
29+
variableProvider = new VariableProvider(log, new MetaDataCalculator());
2930
}
3031

3132
[Test]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using GitVersion.Logging;
1010
using GitVersion.OutputVariables;
1111
using GitVersion.SemanticVersioning;
12+
using GitVersion.VersionCalculation;
1213

1314
namespace GitVersionCore.Tests.BuildServers
1415
{
@@ -24,7 +25,7 @@ public void SetUp()
2425
{
2526
environment = new TestEnvironment();
2627
log = new NullLog();
27-
variableProvider = new VariableProvider(log);
28+
variableProvider = new VariableProvider(log, new MetaDataCalculator());
2829
}
2930

3031
[Test]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using GitVersion.Logging;
1010
using GitVersion.OutputVariables;
1111
using GitVersion.SemanticVersioning;
12+
using GitVersion.VersionCalculation;
1213

1314
namespace GitVersionCore.Tests.BuildServers
1415
{
@@ -24,7 +25,7 @@ public void SetUp()
2425
{
2526
environment = new TestEnvironment();
2627
log = new NullLog();
27-
variableProvider = new VariableProvider(log);
28+
variableProvider = new VariableProvider(log, new MetaDataCalculator());
2829
}
2930

3031
[Test]

‎src/GitVersionCore.Tests/DynamicRepositoryTests.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using GitVersion.Configuration;
55
using NUnit.Framework;
66
using GitVersion.Logging;
7+
using GitVersion.VersionCalculation;
78

89
namespace GitVersionCore.Tests
910
{
@@ -81,7 +82,10 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
8182
var configFileLocator = new DefaultConfigFileLocator(testFileSystem, log);
8283
var gitVersionCache = new GitVersionCache(testFileSystem, log);
8384
var buildServerResolver = new BuildServerResolver(null, log);
84-
var executeCore = new GitVersionCalculator(testFileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
85+
86+
var metaDataCalculator = new MetaDataCalculator();
87+
var gitVersionFinder = new GitVersionFinder(log, metaDataCalculator);
88+
var executeCore = new GitVersionCalculator(testFileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
8589

8690
var versionVariables = executeCore.CalculateVersionVariables(arguments);
8791

‎src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using GitVersion.Helpers;
99
using GitVersion.Logging;
1010
using GitVersion.SemanticVersioning;
11+
using GitVersion.VersionCalculation;
1112

1213
namespace GitVersionCore.Tests
1314
{
@@ -28,7 +29,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
2829
}
2930

3031
var log = new NullLog();
31-
var variableProvider = new VariableProvider(log);
32+
var variableProvider = new VariableProvider(log, new MetaDataCalculator());
3233
var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);
3334
var executeGitVersion = ExecuteGitVersion(gitVersionContext);
3435
var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
@@ -72,8 +73,8 @@ public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config c
7273

7374
private static SemanticVersion ExecuteGitVersion(GitVersionContext context)
7475
{
75-
var vf = new GitVersionFinder();
76-
return vf.FindVersion(new NullLog(), context);
76+
var vf = new GitVersionFinder(new NullLog(), new MetaDataCalculator());
77+
return vf.FindVersion(context);
7778
}
7879

7980
/// <summary>

‎src/GitVersionCore.Tests/GitVersionExecutorTests.cs

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using LibGit2Sharp;
1313
using GitVersionCore.Tests.Helpers;
1414
using GitVersion.Logging;
15+
using GitVersion.VersionCalculation;
1516
using Environment = System.Environment;
1617

1718
namespace GitVersionCore.Tests
@@ -26,6 +27,8 @@ public class GitVersionExecutorTests : TestBase
2627
private IConfigFileLocator configFileLocator;
2728
private IBuildServerResolver buildServerResolver;
2829
private IGitVersionCache gitVersionCache;
30+
private IMetaDataCalculator metaDataCalculator;
31+
private IGitVersionFinder gitVersionFinder;
2932

3033
[SetUp]
3134
public void SetUp()
@@ -36,12 +39,14 @@ public void SetUp()
3639
configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
3740
buildServerResolver = new BuildServerResolver(null, log);
3841
gitVersionCache = new GitVersionCache(fileSystem, log);
42+
metaDataCalculator = new MetaDataCalculator();
43+
gitVersionFinder = new GitVersionFinder(log, metaDataCalculator);
3944
}
4045

4146
[Test]
4247
public void CacheKeySameAfterReNormalizing()
4348
{
44-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
49+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
4550

4651
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
4752
{
@@ -69,7 +74,7 @@ public void CacheKeySameAfterReNormalizing()
6974
[Description("LibGit2Sharp fails here when running under Mono")]
7075
public void CacheKeyForWorktree()
7176
{
72-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
77+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
7378

7479
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
7580
{
@@ -143,7 +148,7 @@ public void CacheFileExistsOnDisk()
143148
log = new Log(logAppender);
144149

145150
gitVersionCache = new GitVersionCache(fileSystem, log);
146-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
151+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
147152

148153
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
149154
{
@@ -192,7 +197,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
192197
CommitDate: 2015-11-10
193198
";
194199

195-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
200+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
196201

197202
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
198203
{
@@ -230,7 +235,7 @@ public void CacheFileIsMissing()
230235
log = new Log(logAppender);
231236
gitVersionCache = new GitVersionCache(fileSystem, log);
232237

233-
var executeCore = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
238+
var executeCore = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
234239

235240
RepositoryScope(executeCore);
236241
var logsMessages = stringBuilder.ToString();
@@ -274,7 +279,7 @@ public void ConfigChangeInvalidatesCache()
274279
CommitDate: 2015-11-10
275280
";
276281

277-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
282+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
278283

279284
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
280285
{
@@ -327,7 +332,7 @@ public void NoCacheBypassesCache()
327332
CommitDate: 2015-11-10
328333
";
329334

330-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
335+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
331336

332337
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
333338
{
@@ -347,7 +352,7 @@ public void NoCacheBypassesCache()
347352
[Test]
348353
public void WorkingDirectoryWithoutGit()
349354
{
350-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
355+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
351356

352357
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
353358
{
@@ -363,7 +368,7 @@ public void WorkingDirectoryWithoutGit()
363368
[Description("LibGit2Sharp fails when running under Mono")]
364369
public void GetProjectRootDirectory_WorkingDirectoryWithWorktree()
365370
{
366-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
371+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
367372

368373
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
369374
{
@@ -395,7 +400,7 @@ public void GetProjectRootDirectory_WorkingDirectoryWithWorktree()
395400
[Test]
396401
public void GetProjectRootDirectory_NoWorktree()
397402
{
398-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
403+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
399404

400405
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
401406
{
@@ -416,7 +421,7 @@ public void GetProjectRootDirectory_NoWorktree()
416421
[Test]
417422
public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
418423
{
419-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
424+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
420425

421426
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
422427
{
@@ -434,7 +439,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
434439
[Test]
435440
public void GetDotGitDirectory_NoWorktree()
436441
{
437-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
442+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
438443

439444
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
440445
{
@@ -457,7 +462,7 @@ public void GetDotGitDirectory_NoWorktree()
457462
[Description("LibGit2Sharp fails when running under Mono")]
458463
public void GetDotGitDirectory_Worktree()
459464
{
460-
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
465+
var versionAndBranchFinder = new GitVersionCalculator(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator);
461466

462467
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
463468
{

‎src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using GitVersion.Extensions.GitVersionInformationResources;
77
using GitVersion.Logging;
88
using GitVersion.SemanticVersioning;
9+
using GitVersion.VersionCalculation;
910

1011
namespace GitVersionCore.Tests
1112
{
@@ -41,7 +42,7 @@ public void ShouldCreateFile(string fileExtension)
4142
"feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
4243
};
4344

44-
var variableProvider = new VariableProvider(new NullLog());
45+
var variableProvider = new VariableProvider(new NullLog(), new MetaDataCalculator());
4546
var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
4647
var generator = new GitVersionInformationGenerator(fileName, directory, variables, fileSystem);
4748

‎src/GitVersionCore.Tests/JsonVersionBuilderTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using GitVersion.OutputFormatters;
66
using GitVersion.OutputVariables;
77
using GitVersion.SemanticVersioning;
8+
using GitVersion.VersionCalculation;
89

910
namespace GitVersionCore.Tests
1011
{
@@ -33,7 +34,7 @@ public void Json()
3334

3435
var config = new TestEffectiveConfiguration();
3536

36-
var variableProvider = new VariableProvider(new NullLog());
37+
var variableProvider = new VariableProvider(new NullLog(), new MetaDataCalculator());
3738
var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
3839
var json = JsonOutputFormatter.ToJson(variables);
3940
json.ShouldMatchApproved(c => c.SubFolder("Approved"));

0 commit comments

Comments
 (0)