Skip to content

Commit

Permalink
(maint) Fix incorrect naming style uses
Browse files Browse the repository at this point in the history 
A while back we started implementing a standard of the naming style
that is meant to be followed in the repository.
At that time not everything was renamed to follow this new naming style,
and this change attempts to update all remaining items that hadn't been
renamed.
  • Loading branch information
@AdmiringWorm
AdmiringWorm committed Jun 28, 2023
1 parent a6bbcbd commit ae3bfb7
Show file tree
Hide file tree
Showing 52 changed files with 3,039 additions and 3,011 deletions.
108 changes: 54 additions & 54 deletions src/chocolatey.tests.integration/Scenario.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@ public class Scenario

private static readonly DotNetFileSystem _fileSystem = new DotNetFileSystem();

public static string get_top_level()
public static string GetTopLevel()
{
return _fileSystem.GetDirectoryName(_fileSystem.GetCurrentAssemblyPath());
}

public static string get_package_install_path()
public static string GetPackageInstallPath()
{
return _fileSystem.CombinePaths(get_top_level(), "lib");
return _fileSystem.CombinePaths(GetTopLevel(), "lib");
}

public static IEnumerable<string> get_installed_package_paths()
public static IEnumerable<string> GetInstalledPackagePaths()
{
return _fileSystem.GetFiles(get_package_install_path(), "*" + NuGetConstants.PackageExtension, SearchOption.AllDirectories);
return _fileSystem.GetFiles(GetPackageInstallPath(), "*" + NuGetConstants.PackageExtension, SearchOption.AllDirectories);
}

public static void reset(ChocolateyConfiguration config)
public static void Reset(ChocolateyConfiguration config)
{
string packagesInstallPath = get_package_install_path();
string badPackagesPath = get_package_install_path() + "-bad";
string backupPackagesPath = get_package_install_path() + "-bkp";
string packagesInstallPath = GetPackageInstallPath();
string badPackagesPath = GetPackageInstallPath() + "-bad";
string backupPackagesPath = GetPackageInstallPath() + "-bkp";
string shimsPath = ApplicationParameters.ShimsLocation;
string hooksPath = ApplicationParameters.HooksLocation;

Expand All @@ -68,8 +68,8 @@ public static void reset(ChocolateyConfiguration config)
_fileSystem.DeleteDirectoryChecked(shimsPath, recursive: true, overrideAttributes: true);
_fileSystem.DeleteDirectoryChecked(badPackagesPath, recursive: true, overrideAttributes: true);
_fileSystem.DeleteDirectoryChecked(backupPackagesPath, recursive: true, overrideAttributes: true);
_fileSystem.DeleteDirectoryChecked(_fileSystem.CombinePaths(get_top_level(), ".chocolatey"), recursive: true, overrideAttributes: true);
_fileSystem.DeleteDirectoryChecked(_fileSystem.CombinePaths(get_top_level(), "extensions"), recursive: true, overrideAttributes: true);
_fileSystem.DeleteDirectoryChecked(_fileSystem.CombinePaths(GetTopLevel(), ".chocolatey"), recursive: true, overrideAttributes: true);
_fileSystem.DeleteDirectoryChecked(_fileSystem.CombinePaths(GetTopLevel(), "extensions"), recursive: true, overrideAttributes: true);
_fileSystem.DeleteDirectoryChecked(hooksPath, recursive: true, overrideAttributes: true);

_fileSystem.CreateDirectory(config.CacheLocation);
Expand All @@ -78,16 +78,16 @@ public static void reset(ChocolateyConfiguration config)
_fileSystem.CreateDirectory(shimsPath);
_fileSystem.CreateDirectory(badPackagesPath);
_fileSystem.CreateDirectory(backupPackagesPath);
_fileSystem.CreateDirectory(_fileSystem.CombinePaths(get_top_level(), ".chocolatey"));
_fileSystem.CreateDirectory(_fileSystem.CombinePaths(get_top_level(), "extensions"));
_fileSystem.CreateDirectory(_fileSystem.CombinePaths(GetTopLevel(), ".chocolatey"));
_fileSystem.CreateDirectory(_fileSystem.CombinePaths(GetTopLevel(), "extensions"));

PowershellExecutor.AllowUseWindow = false;
}

public static void add_packages_to_source_location(ChocolateyConfiguration config, string pattern)
public static void AddPackagesToSourceLocation(ChocolateyConfiguration config, string pattern)
{
_fileSystem.EnsureDirectoryExists(config.Sources);
var contextDir = _fileSystem.CombinePaths(get_top_level(), "context");
var contextDir = _fileSystem.CombinePaths(GetTopLevel(), "context");
var files = _fileSystem.GetFiles(contextDir, pattern, SearchOption.AllDirectories);

foreach (var file in files.OrEmpty())
Expand All @@ -96,11 +96,11 @@ public static void add_packages_to_source_location(ChocolateyConfiguration confi
}
}

public static void add_machine_source(ChocolateyConfiguration config, string name, string path = null, int priority = 0, bool createDirectory = true)
public static void AddMachineSource(ChocolateyConfiguration config, string name, string path = null, int priority = 0, bool createDirectory = true)
{
if (string.IsNullOrEmpty(path))
{
path = _fileSystem.CombinePaths(get_top_level(), "PrioritySources", name);
path = _fileSystem.CombinePaths(GetTopLevel(), "PrioritySources", name);
}

if (createDirectory)
Expand All @@ -117,14 +117,14 @@ public static void add_machine_source(ChocolateyConfiguration config, string nam
config.MachineSources.Add(newSource);
}

public static string add_packages_to_priority_source_location(ChocolateyConfiguration config, string pattern, int priority = 0, string name = null)
public static string AddPackagesToPrioritySourceLocation(ChocolateyConfiguration config, string pattern, int priority = 0, string name = null)
{
if (name == null)
{
name = "Priority" + priority;
}

var prioritySourceDirectory = _fileSystem.CombinePaths(get_top_level(), "PrioritySources", name);
var prioritySourceDirectory = _fileSystem.CombinePaths(GetTopLevel(), "PrioritySources", name);

var machineSource = config.MachineSources.FirstOrDefault(m => m.Name.IsEqualTo(name));

Expand All @@ -145,7 +145,7 @@ public static string add_packages_to_priority_source_location(ChocolateyConfigur

_fileSystem.EnsureDirectoryExists(prioritySourceDirectory);

var contextDir = _fileSystem.CombinePaths(get_top_level(), "context");
var contextDir = _fileSystem.CombinePaths(GetTopLevel(), "context");
var files = _fileSystem.GetFiles(contextDir, pattern, SearchOption.AllDirectories).OrEmpty().ToList();

if (files.Count == 0)
Expand All @@ -161,7 +161,7 @@ public static string add_packages_to_priority_source_location(ChocolateyConfigur
return machineSource.Name;
}

public static void remove_packages_from_destination_location(ChocolateyConfiguration config, string pattern)
public static void RemovePackagesFromDestinationLocation(ChocolateyConfiguration config, string pattern)
{
if (!_fileSystem.DirectoryExists(config.Sources))
{
Expand All @@ -176,7 +176,7 @@ public static void remove_packages_from_destination_location(ChocolateyConfigura
}
}

public static void install_package(ChocolateyConfiguration config, string packageId, string version)
public static void InstallPackage(ChocolateyConfiguration config, string packageId, string version)
{
if (_service == null)
{
Expand All @@ -192,7 +192,7 @@ public static void install_package(ChocolateyConfiguration config, string packag
NUnitSetup.MockLogger.Messages.Clear();
}

public static void add_files(IEnumerable<Tuple<string, string>> files)
public static void AddFiles(IEnumerable<Tuple<string, string>> files)
{
foreach (var file in files)
{
Expand All @@ -204,26 +204,26 @@ public static void add_files(IEnumerable<Tuple<string, string>> files)
}
}

public static void create_directory(string directoryPath)
public static void CreateDirectory(string directoryPath)
{
_fileSystem.CreateDirectory(directoryPath);
}

public static void add_changed_version_package_to_source_location(ChocolateyConfiguration config, string pattern, string newVersion)
public static void AddChangedVersionPackageToSourceLocation(ChocolateyConfiguration config, string pattern, string newVersion)
{
_fileSystem.EnsureDirectoryExists(config.Sources);
var contextDir = _fileSystem.CombinePaths(get_top_level(), "context");
var contextDir = _fileSystem.CombinePaths(GetTopLevel(), "context");
var files = _fileSystem.GetFiles(contextDir, pattern, SearchOption.AllDirectories);

foreach (var file in files.OrEmpty())
{
var copyToPath = _fileSystem.CombinePaths(config.Sources, _fileSystem.GetFileName(file));
_fileSystem.CopyFile(_fileSystem.GetFullPath(file), copyToPath, overwriteExisting: true);
change_package_version(copyToPath, newVersion);
ChangePackageVersion(copyToPath, newVersion);
}
}

public static void change_package_version(string existingPackagePath, string newVersion)
public static void ChangePackageVersion(string existingPackagePath, string newVersion)
{
string packageId;
XDocument nuspecXml;
Expand Down Expand Up @@ -256,9 +256,9 @@ public static void change_package_version(string existingPackagePath, string new
_fileSystem.MoveFile(existingPackagePath, renamedPath);
}

private static ChocolateyConfiguration baseline_configuration()
private static ChocolateyConfiguration BaselineConfiguration()
{
delete_test_package_directories();
DeleteTestPackageDirectories();

// note that this does not mean an empty configuration. It does get influenced by
// prior commands, so ensure that all items go back to the default values here
Expand All @@ -279,7 +279,7 @@ private static ChocolateyConfiguration baseline_configuration()
config.Information.IsLicensedVersion = false;
config.AcceptLicense = true;
config.AllowUnofficialBuild = true;
config.CacheLocation = _fileSystem.GetFullPath(_fileSystem.CombinePaths(get_top_level(), "cache"));
config.CacheLocation = _fileSystem.GetFullPath(_fileSystem.CombinePaths(GetTopLevel(), "cache"));
config.CommandExecutionTimeoutSeconds = 2700;
config.Force = false;
config.ForceDependencies = false;
Expand All @@ -297,7 +297,7 @@ private static ChocolateyConfiguration baseline_configuration()
config.PromptForConfirmation = false;
config.RegularOutput = true;
config.SkipPackageInstallProvider = false;
config.Sources = _fileSystem.GetFullPath(_fileSystem.CombinePaths(get_top_level(), "packages"));
config.Sources = _fileSystem.GetFullPath(_fileSystem.CombinePaths(GetTopLevel(), "packages"));
config.Version = null;
config.Debug = true;
config.AllVersions = false;
Expand Down Expand Up @@ -326,90 +326,90 @@ private static ChocolateyConfiguration baseline_configuration()
return config;
}

public static ChocolateyConfiguration install()
public static ChocolateyConfiguration Install()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = CommandNameType.Install.ToStringSafe();

return config;
}

public static ChocolateyConfiguration upgrade()
public static ChocolateyConfiguration Upgrade()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = CommandNameType.Upgrade.ToStringSafe();

return config;
}

public static ChocolateyConfiguration uninstall()
public static ChocolateyConfiguration Uninstall()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = CommandNameType.Uninstall.ToStringSafe();

return config;
}

public static ChocolateyConfiguration list()
public static ChocolateyConfiguration List()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = "list";

return config;
}

public static ChocolateyConfiguration search()
public static ChocolateyConfiguration Search()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = "search";

return config;
}

public static ChocolateyConfiguration info()
public static ChocolateyConfiguration Info()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = "info";
config.Verbose = true;
config.ListCommand.Exact = true;

return config;
}

public static ChocolateyConfiguration pin()
public static ChocolateyConfiguration Pin()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = "pin";

return config;
}

public static ChocolateyConfiguration pack()
public static ChocolateyConfiguration Pack()
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.CommandName = "pack";

return config;
}

public static ChocolateyConfiguration proxy()
public static ChocolateyConfiguration Proxy()
{
return baseline_configuration();
return BaselineConfiguration();
}

public static void set_configuration_file_setting(string name, string value)
public static void SetConfigurationFileSetting(string name, string value)
{
var config = baseline_configuration();
var config = BaselineConfiguration();
config.ConfigCommand.Name = name;
config.ConfigCommand.ConfigValue = value;
config.ConfigCommand.Command = ConfigCommandType.Set;
var configService = NUnitSetup.Container.GetInstance<IChocolateyConfigSettingsService>();
configService.SetConfig(config);
}

private static void delete_test_package_directories()
private static void DeleteTestPackageDirectories()
{
var topDirectory = get_top_level();
var topDirectory = GetTopLevel();

var directoriesToClean = new[]
{
Expand Down
12 changes: 6 additions & 6 deletions src/chocolatey.tests.integration/infrastructure.app/builders/ConfigurationBuilderSpecs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ public ProxyConfigurationBase(bool systemSet, bool environmentVariableSet, bool

public override void Context()
{
Configuration = Scenario.proxy();
Scenario.set_configuration_file_setting(ConfigurationFileProxySettingName, string.Empty);
Scenario.set_configuration_file_setting(ConfigurationFileProxyBypassSettingName, string.Empty);
Scenario.reset(Configuration);
Configuration = Scenario.Proxy();
Scenario.SetConfigurationFileSetting(ConfigurationFileProxySettingName, string.Empty);
Scenario.SetConfigurationFileSetting(ConfigurationFileProxyBypassSettingName, string.Empty);
Scenario.Reset(Configuration);
Container = NUnitSetup.Container;
License = new ChocolateyLicense();
Environment = new Mock<IEnvironment>();
Expand Down Expand Up @@ -125,7 +125,7 @@ public override void Context()

if (ConfigSet)
{
Scenario.set_configuration_file_setting(ConfigurationFileProxySettingName, ConfigurationFileProxyValue);
Scenario.SetConfigurationFileSetting(ConfigurationFileProxySettingName, ConfigurationFileProxyValue);
}

if (ArgumentSet)
Expand Down Expand Up @@ -187,7 +187,7 @@ public override void Context()

if (ConfigSet)
{
Scenario.set_configuration_file_setting(ConfigurationFileProxyBypassSettingName, ConfigurationFileProxyValue);
Scenario.SetConfigurationFileSetting(ConfigurationFileProxyBypassSettingName, ConfigurationFileProxyValue);
}

if (EnvironmentVariableSet)
Expand Down
Loading

0 comments on commit ae3bfb7

Please sign in to comment.