Skip to content

Commit d61823b

Browse files
committed
migrate to DI NextVersionCalculator
1 parent 7fbd21a commit d61823b

17 files changed

+48
-26
lines changed

src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public void Setup()
2727
ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
2828
log = new NullLog();
2929
var baseVersionCalculator = new BaseVersionCalculator(log, null);
30-
variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
30+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
31+
variableProvider = new VariableProvider(nextVersionCalculator);
3132
}
3233

3334
[TestCase("cs")]

src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public void SetUp()
2424
environment = new TestEnvironment();
2525
log = new NullLog();
2626
var baseVersionCalculator = new BaseVersionCalculator(log, null);
27-
variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
27+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
28+
variableProvider = new VariableProvider(nextVersionCalculator);
2829
}
2930

3031
[Test]

src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public void SetUp()
2828
environment = new TestEnvironment();
2929
var baseVersionCalculator = new BaseVersionCalculator(log, null);
3030

31-
variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
31+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
32+
variableProvider = new VariableProvider(nextVersionCalculator);
3233
}
3334

3435
[Test]

src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public void SetUp()
2626
environment = new TestEnvironment();
2727
log = new NullLog();
2828
var baseVersionCalculator = new BaseVersionCalculator(log, null);
29-
variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
29+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
30+
variableProvider = new VariableProvider(nextVersionCalculator);
3031
}
3132

3233
[Test]

src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public void SetUp()
2626
environment = new TestEnvironment();
2727
log = new NullLog();
2828
var baseVersionCalculator = new BaseVersionCalculator(log, null);
29-
variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
29+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
30+
variableProvider = new VariableProvider(nextVersionCalculator);
3031
}
3132

3233
[Test]

src/GitVersionCore.Tests/DynamicRepositoryTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
9292
var gitPreparer = new GitPreparer(log, arguments);
9393
var configurationProvider = new ConfigurationProvider(testFileSystem, log, configFileLocator, gitPreparer);
9494

95-
var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
95+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
96+
var variableProvider = new VariableProvider(nextVersionCalculator);
9697
var gitVersionCalculator = new GitVersionCalculator(testFileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider);
9798

9899
var versionVariables = gitVersionCalculator.CalculateVersionVariables(arguments);

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
3131

3232
var log = new NullLog();
3333
var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
34-
var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
34+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
35+
var variableProvider = new VariableProvider(nextVersionCalculator);
3536
var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);
3637
var executeGitVersion = ExecuteGitVersion(gitVersionContext);
3738
var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);

src/GitVersionCore.Tests/GitVersionExecutorTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,8 @@ private void RepositoryScope(ILog _log, Action<EmptyRepositoryFixture, VersionVa
522522
var gitPreparer = new GitPreparer(_log, arguments);
523523
var configurationProvider = new ConfigurationProvider(fileSystem, _log, configFileLocator, gitPreparer);
524524
var baseVersionCalculator = new BaseVersionCalculator(log, null);
525-
var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
525+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
526+
var variableProvider = new VariableProvider(nextVersionCalculator);
526527
var gitVersionCalculator = new GitVersionCalculator(fileSystem, _log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider);
527528

528529
fixture.Repository.MakeACommit();
@@ -539,7 +540,8 @@ private GitVersionCalculator GetGitVersionCalculator(Arguments arguments)
539540
var gitPreparer = new GitPreparer(log, arguments);
540541
var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
541542
var baseVersionCalculator = new BaseVersionCalculator(log, null);
542-
var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
543+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
544+
var variableProvider = new VariableProvider(nextVersionCalculator);
543545
var gitVersionCalculator = new GitVersionCalculator(fileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider);
544546
return gitVersionCalculator;
545547
}

src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ public void ShouldCreateFile(string fileExtension)
4242
"feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
4343
};
4444

45-
var baseVersionCalculator = new BaseVersionCalculator(new NullLog(), null);
46-
var variableProvider = new VariableProvider(new NullLog(), new MetaDataCalculator(), baseVersionCalculator);
45+
var log = new NullLog();
46+
var baseVersionCalculator = new BaseVersionCalculator(log, null);
47+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
48+
var variableProvider = new VariableProvider(nextVersionCalculator);
4749
var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
4850
var generator = new GitVersionInformationGenerator(fileName, directory, variables, fileSystem);
4951

src/GitVersionCore.Tests/JsonVersionBuilderTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public void Json()
3636

3737
var log = new NullLog();
3838
var baseVersionCalculator = new BaseVersionCalculator(log, null);
39-
var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
39+
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
40+
var variableProvider = new VariableProvider(nextVersionCalculator);
4041
var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
4142
var json = JsonOutputFormatter.ToJson(variables);
4243
json.ShouldMatchApproved(c => c.SubFolder("Approved"));

0 commit comments

Comments
 (0)