From 75a87707bfb81d5abd41db3b3a970c2f2d9153ef Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Fri, 22 Mar 2024 08:45:04 -0500 Subject: [PATCH] refactor: Use collection expressions in a few places --- .../PipelinePhases/Config/NamingFormatLookup.cs | 2 +- src/Recyclarr.VersionControl/GitRepositoryFactory.cs | 4 ++-- src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs | 2 +- .../Recyclarr.Cli.IntegrationTests/CompositionRootTest.cs | 2 +- .../Config/Parsing/ConfigurationFinderTest.cs | 6 +++--- .../TrashGuide/QualitySize/QualityItemTest.cs | 8 ++++---- .../TrashGuide/QualitySize/QualitySizeItemTest.cs | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/Config/NamingFormatLookup.cs b/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/Config/NamingFormatLookup.cs index 259bf508..e8df30d1 100644 --- a/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/Config/NamingFormatLookup.cs +++ b/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/Config/NamingFormatLookup.cs @@ -2,7 +2,7 @@ namespace Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases.Config; public class NamingFormatLookup { - private readonly List _errors = new(); + private readonly List _errors = []; public IReadOnlyCollection Errors => _errors; public string? ObtainFormat( diff --git a/src/Recyclarr.VersionControl/GitRepositoryFactory.cs b/src/Recyclarr.VersionControl/GitRepositoryFactory.cs index 58f6ef2b..a8a818a8 100644 --- a/src/Recyclarr.VersionControl/GitRepositoryFactory.cs +++ b/src/Recyclarr.VersionControl/GitRepositoryFactory.cs @@ -7,11 +7,11 @@ public class GitRepositoryFactory(ILogger log, IGitPath gitPath) : IGitRepositor { // A few hand-picked files that should exist in a .git directory. private static readonly string[] ValidGitPaths = - { + [ ".git/config", ".git/index", ".git/HEAD" - }; + ]; public async Task CreateAndCloneIfNeeded( Uri repoUrl, diff --git a/src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs b/src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs index 70bb5043..24758e29 100644 --- a/src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs +++ b/src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs @@ -7,7 +7,7 @@ namespace Recyclarr.Yaml.YamlDotNet; public sealed class SyntaxErrorHelper : INodeTypeResolver { - private static readonly string[] CollectionKeywords = {"Collection", "List"}; + private static readonly string[] CollectionKeywords = ["Collection", "List"]; public bool Resolve(NodeEvent? nodeEvent, ref Type currentType) { diff --git a/tests/Recyclarr.Cli.IntegrationTests/CompositionRootTest.cs b/tests/Recyclarr.Cli.IntegrationTests/CompositionRootTest.cs index 8f28574f..323f2fd3 100644 --- a/tests/Recyclarr.Cli.IntegrationTests/CompositionRootTest.cs +++ b/tests/Recyclarr.Cli.IntegrationTests/CompositionRootTest.cs @@ -35,7 +35,7 @@ public class CompositionRootTest .Select(x => x.ServiceType) .Distinct() .Where(x => x.FullName == null || !x.FullName.StartsWith("Autofac.")) - .Select(x => new TestCaseParameters(new object[] {container, x}) {TestName = x.FullName}) + .Select(x => new TestCaseParameters([container, x]) {TestName = x.FullName}) .GetEnumerator(); } } diff --git a/tests/Recyclarr.Tests/Config/Parsing/ConfigurationFinderTest.cs b/tests/Recyclarr.Tests/Config/Parsing/ConfigurationFinderTest.cs index 68ed73c6..5e57ec63 100644 --- a/tests/Recyclarr.Tests/Config/Parsing/ConfigurationFinderTest.cs +++ b/tests/Recyclarr.Tests/Config/Parsing/ConfigurationFinderTest.cs @@ -10,12 +10,12 @@ public class ConfigurationFinderTest { private static IFileInfo[] GetYamlPaths(IAppPaths paths) { - return new[] - { + return + [ paths.AppDataDirectory.File("recyclarr.yml"), paths.ConfigsDirectory.File("b.yml"), paths.ConfigsDirectory.File("c.yaml") - }; + ]; } [Test, AutoMockData] diff --git a/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualityItemTest.cs b/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualityItemTest.cs index 43bc4ed2..039cc7fc 100644 --- a/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualityItemTest.cs +++ b/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualityItemTest.cs @@ -6,7 +6,7 @@ namespace Recyclarr.Tests.TrashGuide.QualitySize; public class QualityItemTest { private static readonly object[] MaxTestValues = - { + [ new object?[] {100m, 100m, false}, new object?[] {100m, 101m, true}, new object?[] {100m, 98m, true}, @@ -14,14 +14,14 @@ public class QualityItemTest new object?[] {QualityItem.MaxUnlimitedThreshold, null, false}, new object?[] {QualityItem.MaxUnlimitedThreshold - 1, null, true}, new object?[] {QualityItem.MaxUnlimitedThreshold, QualityItem.MaxUnlimitedThreshold, true} - }; + ]; private static readonly object[] MinTestValues = - { + [ new object?[] {0m, 0m, false}, new object?[] {0m, -1m, true}, new object?[] {0m, 1m, true} - }; + ]; [TestCaseSource(nameof(MaxTestValues))] public void MaxDifferent_WithVariousValues_ReturnsExpectedResult( diff --git a/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualitySizeItemTest.cs b/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualitySizeItemTest.cs index 2ce8e446..b118bf29 100644 --- a/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualitySizeItemTest.cs +++ b/tests/Recyclarr.Tests/TrashGuide/QualitySize/QualitySizeItemTest.cs @@ -6,7 +6,7 @@ namespace Recyclarr.Tests.TrashGuide.QualitySize; public class QualitySizeItemTest { private static readonly object[] PreferredTestValues = - { + [ new object?[] {100m, 100m, false}, new object?[] {100m, 101m, true}, new object?[] {100m, 98m, true}, @@ -15,7 +15,7 @@ public class QualitySizeItemTest new object?[] {QualitySizeItem.PreferredUnlimitedThreshold - 1, null, true}, new object?[] {QualitySizeItem.PreferredUnlimitedThreshold, QualitySizeItem.PreferredUnlimitedThreshold, true} - }; + ]; [TestCaseSource(nameof(PreferredTestValues))] public void PreferredDifferent_WithVariousValues_ReturnsExpectedResult( @@ -29,7 +29,7 @@ public class QualitySizeItemTest } private static readonly object[] InterpolatedPreferredTestParams = - { + [ new[] { 400m, @@ -60,7 +60,7 @@ public class QualitySizeItemTest 0.5m, 50m } - }; + ]; [TestCaseSource(nameof(InterpolatedPreferredTestParams))] public void InterpolatedPreferred_VariousValues_ExpectedResults(