adjusted field names, removed underscore

src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

@@ -403,7 +403,7 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
         [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>\r\n' comment\r\n")]
         [Category("NoMono")]
         [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
-        public void Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
+        public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
         {
             var workingDir = Path.GetTempPath();
             var assemblyInfoFile = "AssemblyInfo." + fileExtension;

src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs

@@ -29,7 +29,7 @@ public void ClearEnvironmentVariableForTest()
         }
 
         [Test]
-        public void Develop_branch()
+        public void DevelopBranch()
         {
             var versionBuilder = new AzurePipelines(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");

src/GitVersionCore.Tests/BuildServers/DroneTests.cs

@@ -27,7 +27,7 @@ public void TearDown()
         }
 
         [Test]
-        public void CanApplyToCurrentContext_ShouldBeTrue_WhenEnvironmentVariableIsSet()
+        public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
         {
             // Arrange
             var buildServer = new Drone(environment, log);
@@ -40,7 +40,7 @@ public void CanApplyToCurrentContext_ShouldBeTrue_WhenEnvironmentVariableIsSet()
         }
 
         [Test]
-        public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotSet()
+        public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
         {
             // Arrange
             environment.SetEnvironmentVariable("DRONE", "");
@@ -54,7 +54,7 @@ public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotS
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
+        public void GetCurrentBranchShouldDroneBranchInCaseOfPush()
         {
             // Arrange
             const string droneBranch = "droneBranch";
@@ -72,7 +72,7 @@ public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNonEmptyDroneSourceBranch()
+        public void GetCurrentBranchShouldUseDroneSourceBranchInCaseOfPullRequestAndNonEmptyDroneSourceBranch()
         {
             // Arrange
             const string droneSourceBranch = "droneSourceBranch";
@@ -89,13 +89,13 @@ public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNo
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPullRequestAndEmptyDroneSourceBranch()
+        public void GetCurrentBranchShouldUseSourceBranchFromCiCommitRefSpecInCaseOfPullRequestAndEmptyDroneSourceBranch()
         {
             // Arrange
             const string droneSourceBranch = "droneSourceBranch";
             const string droneDestinationBranch = "droneDestinationBranch";
 
-            string ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
+            var ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
 
             environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
             environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
@@ -111,7 +111,7 @@ public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPu
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
+        public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
         {
             // Arrange
             const string droneBranch = "droneBranch";
@@ -131,14 +131,14 @@ public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDro
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
+        public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
         {
             // Arrange
             const string droneBranch = "droneBranch";
             const string droneSourceBranch = "droneSourceBranch";
             const string droneDestinationBranch = "droneDestinationBranch";
 
-            string ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
+            var ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
 
             environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
             environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");

src/GitVersionCore.Tests/BuildServers/EnvRunTests.cs

@@ -36,25 +36,25 @@ public void ClearEnvironmentVariableForTest()
         [Test]
         public void CanApplyToCurrentContext()
         {
-            EnvRun envrun = new EnvRun(environment, log);
-            bool applys = envrun.CanApplyToCurrentContext();
+            var envrun = new EnvRun(environment, log);
+            var applys = envrun.CanApplyToCurrentContext();
             applys.ShouldBeTrue();
         }
 
         [Test]
-        public void CanApplyToCurrentContext_EnvironmentVariableNotSet()
+        public void CanApplyToCurrentContextEnvironmentVariableNotSet()
         {
             environment.SetEnvironmentVariable(EnvVarName, null);
-            EnvRun envrun = new EnvRun(environment, log);
-            bool applys = envrun.CanApplyToCurrentContext();
+            var envrun = new EnvRun(environment, log);
+            var applys = envrun.CanApplyToCurrentContext();
             applys.ShouldBeFalse();
         }
 
         [TestCase("1.2.3")]
         [TestCase("1.2.3-rc4")]
         public void GenerateSetVersionMessage(string fullSemVer)
         {
-            EnvRun envrun = new EnvRun(environment, log);
+            var envrun = new EnvRun(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: fullSemVer);
             var version = envrun.GenerateSetVersionMessage(vars);
             version.ShouldBe(fullSemVer);
@@ -64,7 +64,7 @@ public void GenerateSetVersionMessage(string fullSemVer)
         [TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
         public void GenerateSetParameterMessage(string name, string value, string expected)
         {
-            EnvRun envrun = new EnvRun(environment, log);
+            var envrun = new EnvRun(environment, log);
             var output = envrun.GenerateSetParameterMessage(name, value);
             output.ShouldHaveSingleItem();
             output[0].ShouldBe(expected);

src/GitVersionCore.Tests/BuildServers/EnvironmentVariableJenkinsTests.cs

@@ -54,8 +54,8 @@ public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
         public void JenkinsTakesLocalBranchNameNotRemoteName()
         {
             // Save original values so they can be restored
-            string branchOrig = environment.GetEnvironmentVariable(branch);
-            string localBranchOrig = environment.GetEnvironmentVariable(localBranch);
+            var branchOrig = environment.GetEnvironmentVariable(branch);
+            var localBranchOrig = environment.GetEnvironmentVariable(localBranch);
 
             // Set GIT_BRANCH for testing
             environment.SetEnvironmentVariable(branch, "origin/master");
@@ -79,9 +79,9 @@ public void JenkinsTakesLocalBranchNameNotRemoteName()
         public void JenkinsTakesBranchNameInPipelineAsCode()
         {
             // Save original values so they can be restored
-            string branchOrig = environment.GetEnvironmentVariable(branch);
-            string localBranchOrig = environment.GetEnvironmentVariable(localBranch);
-            string pipelineBranchOrig = environment.GetEnvironmentVariable(pipelineBranch);
+            var branchOrig = environment.GetEnvironmentVariable(branch);
+            var localBranchOrig = environment.GetEnvironmentVariable(localBranch);
+            var pipelineBranchOrig = environment.GetEnvironmentVariable(pipelineBranch);
 
             // Set BRANCH_NAME in pipeline mode
             environment.SetEnvironmentVariable(pipelineBranch, "master");

src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs

@@ -33,7 +33,7 @@ public void SetUp()
         }
 
         [Test]
-        public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
+        public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
         {
             var j = new GitLabCi(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");

src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

@@ -33,7 +33,7 @@ public void SetUp()
         }
 
         [Test]
-        public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
+        public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
         {
             var j = new Jenkins(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");

src/GitVersionCore.Tests/BuildServers/MyGetTests.cs

@@ -19,7 +19,7 @@ public void SetUp()
         }
 
         [Test]
-        public void Develop_branch()
+        public void DevelopBranch()
         {
             var versionBuilder = new MyGet(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");

src/GitVersionCore.Tests/BuildServers/TeamCityTests.cs

@@ -19,7 +19,7 @@ public void SetUp()
         }
 
         [Test]
-        public void Develop_branch()
+        public void DevelopBranch()
         {
             var versionBuilder = new TeamCity(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");

src/GitVersionCore.Tests/Configuration/IgnoreConfigTests.cs

@@ -23,8 +23,8 @@ public void CanDeserialize()
             var config = ConfigSerialiser.Read(reader);
 
             config.Ignore.ShouldNotBeNull();
-            config.Ignore.SHAs.ShouldNotBeEmpty();
-            config.Ignore.SHAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98" });
+            config.Ignore.ShAs.ShouldNotBeEmpty();
+            config.Ignore.ShAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98" });
             config.Ignore.Before.ShouldBe(DateTimeOffset.Parse("2015-10-23T12:23:15"));
         }
 
@@ -42,8 +42,8 @@ public void ShouldSupportsOtherSequenceFormat()
             var config = ConfigSerialiser.Read(reader);
 
             config.Ignore.ShouldNotBeNull();
-            config.Ignore.SHAs.ShouldNotBeEmpty();
-            config.Ignore.SHAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98", "6c19c7c219ecf8dbc468042baefa73a1b213e8b1" });
+            config.Ignore.ShAs.ShouldNotBeEmpty();
+            config.Ignore.ShAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98", "6c19c7c219ecf8dbc468042baefa73a1b213e8b1" });
         }
 
         [Test]
@@ -57,7 +57,7 @@ public void WhenNotInConfigShouldHaveDefaults()
             var config = ConfigSerialiser.Read(reader);
 
             config.Ignore.ShouldNotBeNull();
-            config.Ignore.SHAs.ShouldBeEmpty();
+            config.Ignore.ShAs.ShouldBeEmpty();
             config.Ignore.Before.ShouldBeNull();
         }
 

src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs

@@ -71,7 +71,7 @@ public void ThrowsExceptionOnAmbiguousConfigFileLocation(string repoConfigFile,
             var repositoryConfigFilePath = SetupConfigFileContent(string.Empty, repoConfigFile, repoPath);
             var workingDirectoryConfigFilePath = SetupConfigFileContent(string.Empty, workingConfigFile, workingPath);
 
-            WarningException exception = Should.Throw<WarningException>(() =>
+            var exception = Should.Throw<WarningException>(() =>
             {
                 WithDefaultConfigFileLocator(configFileLocator =>
                 {
@@ -127,7 +127,7 @@ public void WarnOnObsoleteIsDevelopBranchConfigurationSetting()
     tag: beta
     is-develop: true";
 
-            OldConfigurationException exception = Should.Throw<OldConfigurationException>(() =>
+            var exception = Should.Throw<OldConfigurationException>(() =>
             {
                 LegacyConfigNotifier.Notify(new StringReader(text));
             });

src/GitVersionCore.Tests/GitVersionExecutorTests.cs

@@ -371,7 +371,7 @@ public void WorkingDirectoryWithoutGit()
         [Test]
         [Category("NoMono")]
         [Description("LibGit2Sharp fails when running under Mono")]
-        public void GetProjectRootDirectory_WorkingDirectoryWithWorktree()
+        public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
         {
             RepositoryScope((fixture, vv) =>
             {
@@ -402,7 +402,7 @@ public void GetProjectRootDirectory_WorkingDirectoryWithWorktree()
         }
 
         [Test]
-        public void GetProjectRootDirectory_NoWorktree()
+        public void GetProjectRootDirectoryNoWorktree()
         {
             RepositoryScope((fixture, vv) =>
             {
@@ -439,7 +439,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
         }
 
         [Test]
-        public void GetDotGitDirectory_NoWorktree()
+        public void GetDotGitDirectoryNoWorktree()
         {
             RepositoryScope((fixture, vv) =>
             {
@@ -460,7 +460,7 @@ public void GetDotGitDirectory_NoWorktree()
         [Test]
         [Category("NoMono")]
         [Description("LibGit2Sharp fails when running under Mono")]
-        public void GetDotGitDirectory_Worktree()
+        public void GetDotGitDirectoryWorktree()
         {
             RepositoryScope((fixture, vv) =>
             {
@@ -494,7 +494,7 @@ private void RepositoryScope(Action<EmptyRepositoryFixture, VersionVariables> fi
         {
             // Make sure GitVersion doesn't trigger build server mode when we are running the tests
             environment.SetEnvironmentVariable(AppVeyor.EnvironmentVariableName, null);
-            environment.SetEnvironmentVariable(TravisCI.EnvironmentVariableName, null);
+            environment.SetEnvironmentVariable(TravisCi.EnvironmentVariableName, null);
             environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, null);
 
             using var fixture = new EmptyRepositoryFixture();
@@ -512,27 +512,27 @@ private void RepositoryScope(Action<EmptyRepositoryFixture, VersionVariables> fi
             fixtureAction?.Invoke(fixture, vv);
         }
 
-        private void RepositoryScope(ILog _log, Action<EmptyRepositoryFixture, VersionVariables> fixtureAction = null)
+        private void RepositoryScope(ILog log, Action<EmptyRepositoryFixture, VersionVariables> fixtureAction = null)
         {
             // Make sure GitVersion doesn't trigger build server mode when we are running the tests
             environment.SetEnvironmentVariable(AppVeyor.EnvironmentVariableName, null);
-            environment.SetEnvironmentVariable(TravisCI.EnvironmentVariableName, null);
+            environment.SetEnvironmentVariable(TravisCi.EnvironmentVariableName, null);
             environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, null);
 
             using var fixture = new EmptyRepositoryFixture();
 
             var arguments = new Arguments { TargetPath = fixture.RepositoryPath };
             var options = Options.Create(arguments);
 
-            var gitPreparer = new GitPreparer(_log, options);
+            var gitPreparer = new GitPreparer(log, options);
             var stepFactory = new ConfigInitStepFactory();
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
-            var configurationProvider = new ConfigurationProvider(fileSystem, _log, configFileLocator, gitPreparer, configInitWizard);
-            var baseVersionCalculator = new BaseVersionCalculator(log, null);
-            var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
-            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
+            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
+            var baseVersionCalculator = new BaseVersionCalculator(this.log, null);
+            var mainlineVersionCalculator = new MainlineVersionCalculator(this.log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(this.log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
             var variableProvider = new VariableProvider(nextVersionCalculator);
-            var gitVersionCalculator = new GitVersionCalculator(fileSystem, _log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider, options);
+            var gitVersionCalculator = new GitVersionCalculator(fileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider, options);
 
             fixture.Repository.MakeACommit();
             var vv = gitVersionCalculator.CalculateVersionVariables();

src/GitVersionCore.Tests/Helpers/DirectoryHelper.cs

@@ -7,7 +7,7 @@ namespace GitVersionCore.Tests.Helpers
 {
     public static class DirectoryHelper
     {
-        private static readonly Dictionary<string, string> toRename = new Dictionary<string, string>
+        private static readonly Dictionary<string, string> ToRename = new Dictionary<string, string>
         {
             {"gitted", ".git"},
             {"gitmodules", ".gitmodules"},
@@ -29,7 +29,7 @@ public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo targ
 
         private static string Rename(string name)
         {
-            return toRename.ContainsKey(name) ? toRename[name] : name;
+            return ToRename.ContainsKey(name) ? ToRename[name] : name;
         }
 
         public static void DeleteSubDirectories(string parentPath)

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -11,7 +11,7 @@ namespace GitVersionCore.Tests.IntegrationTests
     public class DevelopScenarios : TestBase
     {
         [Test]
-        public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
+        public void WhenDevelopHasMultipleCommitsSpecifyExistingCommitId()
         {
             using var fixture = new EmptyRepositoryFixture();
             fixture.Repository.MakeATaggedCommit("1.0.0");
@@ -27,7 +27,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
         }
 
         [Test]
-        public void WhenDevelopHasMultipleCommits_SpecifyNonExistingCommitId()
+        public void WhenDevelopHasMultipleCommitsSpecifyNonExistingCommitId()
         {
             using var fixture = new EmptyRepositoryFixture();
             fixture.Repository.MakeATaggedCommit("1.0.0");
@@ -85,7 +85,7 @@ public void WhenDeveloperBranchExistsDontTreatAsDevelop()
         }
 
         [Test]
-        public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
+        public void WhenDevelopBranchedFromMasterMinorIsIncreased()
         {
             using var fixture = new EmptyRepositoryFixture();
             fixture.Repository.MakeATaggedCommit("1.0.0");
@@ -95,7 +95,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
         }
 
         [Test]
-        public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevelopVersion()
+        public void MergingReleaseBranchBackIntoDevelopWithMergingToMasterDoesBumpDevelopVersion()
         {
             using var fixture = new EmptyRepositoryFixture();
             fixture.Repository.MakeATaggedCommit("1.0.0");
@@ -133,7 +133,7 @@ public void CanHandleContinuousDelivery()
         }
 
         [Test]
-        public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
+        public void WhenDevelopBranchedFromMasterDetachedHeadMinorIsIncreased()
         {
             using var fixture = new EmptyRepositoryFixture();
             fixture.Repository.MakeATaggedCommit("1.0.0");