Skip to content

Commit 5a9b713

Browse files
arturcicarturcic
committed
moving to DI MainlineVersionCalculator
1 parent 88d51cc commit 5a9b713

23 files changed

+92
-54
lines changed

‎src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ public void Setup()
2626
{
2727
ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
2828
log = new NullLog();
29+
var metaDataCalculator = new MetaDataCalculator();
2930
var baseVersionCalculator = new BaseVersionCalculator(log, null);
30-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
31+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
32+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
3133
variableProvider = new VariableProvider(nextVersionCalculator);
3234
}
3335

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ public void SetUp()
2323
{
2424
environment = new TestEnvironment();
2525
log = new NullLog();
26+
var metaDataCalculator = new MetaDataCalculator();
2627
var baseVersionCalculator = new BaseVersionCalculator(log, null);
27-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
28+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
29+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
2830
variableProvider = new VariableProvider(nextVersionCalculator);
2931
}
3032

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ public void SetUp()
2626
log = new NullLog();
2727

2828
environment = new TestEnvironment();
29+
var metaDataCalculator = new MetaDataCalculator();
2930
var baseVersionCalculator = new BaseVersionCalculator(log, null);
30-
31-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
31+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
32+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
3233
variableProvider = new VariableProvider(nextVersionCalculator);
3334
}
3435

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ public void SetUp()
2525
{
2626
environment = new TestEnvironment();
2727
log = new NullLog();
28+
var metaDataCalculator = new MetaDataCalculator();
2829
var baseVersionCalculator = new BaseVersionCalculator(log, null);
29-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
30+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
31+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
3032
variableProvider = new VariableProvider(nextVersionCalculator);
3133
}
3234

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ public void SetUp()
2525
{
2626
environment = new TestEnvironment();
2727
log = new NullLog();
28+
var metaDataCalculator = new MetaDataCalculator();
2829
var baseVersionCalculator = new BaseVersionCalculator(log, null);
29-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
30+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
31+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
3032
variableProvider = new VariableProvider(nextVersionCalculator);
3133
}
3234

‎src/GitVersionCore.Tests/DynamicRepositoryTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,15 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
8787
var gitVersionCache = new GitVersionCache(testFileSystem, log);
8888
var buildServerResolver = new BuildServerResolver(null, log);
8989

90-
var metaDataCalculator = new MetaDataCalculator();
90+
var metadataCalculator = new MetaDataCalculator();
9191
var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
92-
var gitVersionFinder = new GitVersionFinder(log, metaDataCalculator, baseVersionCalculator);
92+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metadataCalculator);
93+
var nextVersionCalculator = new NextVersionCalculator(log, metadataCalculator, baseVersionCalculator, mainlineVersionCalculator);
94+
var gitVersionFinder = new GitVersionFinder(log, nextVersionCalculator);
9395

9496
var gitPreparer = new GitPreparer(log, arguments);
9597
var configurationProvider = new ConfigurationProvider(testFileSystem, log, configFileLocator, gitPreparer);
96-
97-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
98+
9899
var variableProvider = new VariableProvider(nextVersionCalculator);
99100
var gitVersionCalculator = new GitVersionCalculator(testFileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider, options);
100101

‎src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
3030
}
3131

3232
var log = new NullLog();
33+
var metaDataCalculator = new MetaDataCalculator();
3334
var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
34-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
35+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
36+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
3537
var variableProvider = new VariableProvider(nextVersionCalculator);
3638
var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);
3739
var executeGitVersion = ExecuteGitVersion(gitVersionContext);
@@ -77,8 +79,11 @@ public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config c
7779
private static SemanticVersion ExecuteGitVersion(GitVersionContext context)
7880
{
7981
var log = new NullLog();
82+
var metadataCalculator = new MetaDataCalculator();
8083
var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
81-
var vf = new GitVersionFinder(log, new MetaDataCalculator(), baseVersionCalculator);
84+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metadataCalculator);
85+
var nextVersionCalculator = new NextVersionCalculator(log, metadataCalculator, baseVersionCalculator, mainlineVersionCalculator);
86+
var vf = new GitVersionFinder(log, nextVersionCalculator);
8287
return vf.FindVersion(context);
8388
}
8489

‎src/GitVersionCore.Tests/GitVersionExecutorTests.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ public void SetUp()
4343
gitVersionCache = new GitVersionCache(fileSystem, log);
4444
metaDataCalculator = new MetaDataCalculator();
4545
var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
46+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
47+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
4648

47-
gitVersionFinder = new GitVersionFinder(log, metaDataCalculator, baseVersionCalculator);
49+
gitVersionFinder = new GitVersionFinder(log, nextVersionCalculator);
4850
}
4951

5052
[Test]
@@ -524,7 +526,8 @@ private void RepositoryScope(ILog _log, Action<EmptyRepositoryFixture, VersionVa
524526
var gitPreparer = new GitPreparer(_log, arguments);
525527
var configurationProvider = new ConfigurationProvider(fileSystem, _log, configFileLocator, gitPreparer);
526528
var baseVersionCalculator = new BaseVersionCalculator(log, null);
527-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
529+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
530+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
528531
var variableProvider = new VariableProvider(nextVersionCalculator);
529532
var gitVersionCalculator = new GitVersionCalculator(fileSystem, _log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider, options);
530533

@@ -544,7 +547,8 @@ private GitVersionCalculator GetGitVersionCalculator(Arguments arguments)
544547
var gitPreparer = new GitPreparer(log, arguments);
545548
var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
546549
var baseVersionCalculator = new BaseVersionCalculator(log, null);
547-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
550+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
551+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
548552
var variableProvider = new VariableProvider(nextVersionCalculator);
549553
var gitVersionCalculator = new GitVersionCalculator(fileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider, options);
550554
return gitVersionCalculator;

‎src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ public void ShouldCreateFile(string fileExtension)
4343
};
4444

4545
var log = new NullLog();
46+
var metaDataCalculator = new MetaDataCalculator();
4647
var baseVersionCalculator = new BaseVersionCalculator(log, null);
47-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
48+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
49+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
4850
var variableProvider = new VariableProvider(nextVersionCalculator);
4951
var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
5052
var generator = new GitVersionInformationGenerator(fileName, directory, variables, fileSystem);

‎src/GitVersionCore.Tests/JsonVersionBuilderTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ public void Json()
3535
var config = new TestEffectiveConfiguration();
3636

3737
var log = new NullLog();
38+
var metaDataCalculator = new MetaDataCalculator();
3839
var baseVersionCalculator = new BaseVersionCalculator(log, null);
39-
var nextVersionCalculator = new NextVersionCalculator(log, new MetaDataCalculator(), baseVersionCalculator);
40+
var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
41+
var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
4042
var variableProvider = new VariableProvider(nextVersionCalculator);
4143
var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
4244
var json = JsonOutputFormatter.ToJson(variables);

0 commit comments

Comments
 (0)