From 4935377a4b180c840bc6ae5200a9170c9c343a5a Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Sun, 20 Aug 2023 14:43:52 -0500 Subject: [PATCH] refactor: Remove GetOrDefault method Replaced with .NET's `GetValueOrDefault()` --- .../Extensions/DictionaryExtensions.cs | 5 ----- .../Extensions/DictionaryExtensionsTest.cs | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Recyclarr.Common/Extensions/DictionaryExtensions.cs b/src/Recyclarr.Common/Extensions/DictionaryExtensions.cs index ab46b908..24957184 100644 --- a/src/Recyclarr.Common/Extensions/DictionaryExtensions.cs +++ b/src/Recyclarr.Common/Extensions/DictionaryExtensions.cs @@ -14,9 +14,4 @@ public static class DictionaryExtensions return val; } - - public static TValue? GetOrDefault(this IDictionary dict, TKey key) - { - return dict.TryGetValue(key, out var val) ? val : default; - } } diff --git a/src/tests/Recyclarr.Common.Tests/Extensions/DictionaryExtensionsTest.cs b/src/tests/Recyclarr.Common.Tests/Extensions/DictionaryExtensionsTest.cs index ec6cc3f5..2a4f6dcd 100644 --- a/src/tests/Recyclarr.Common.Tests/Extensions/DictionaryExtensionsTest.cs +++ b/src/tests/Recyclarr.Common.Tests/Extensions/DictionaryExtensionsTest.cs @@ -15,7 +15,7 @@ public class DictionaryExtensionsTest { var dict = new Dictionary(); var theValue = dict.GetOrCreate(100); - dict.Should().HaveCount(1); + dict.Should().ContainSingle(); dict.Should().Contain(100, theValue); } @@ -25,7 +25,7 @@ public class DictionaryExtensionsTest var sample = new MySampleValue(); var dict = new Dictionary {{100, sample}}; - var theValue = dict.GetOrDefault(200); + var theValue = dict.GetValueOrDefault(200); dict.Should().HaveCount(1).And.Contain(100, sample); theValue.Should().BeNull(); @@ -38,7 +38,7 @@ public class DictionaryExtensionsTest var dict = new Dictionary {{100, sample}}; var theValue = dict.GetOrCreate(100); - dict.Should().HaveCount(1); + dict.Should().ContainSingle(); dict.Should().Contain(100, sample); dict.Should().ContainValue(theValue); theValue.Should().Be(sample); @@ -50,10 +50,10 @@ public class DictionaryExtensionsTest var sample = new MySampleValue(); var dict = new Dictionary {{100, sample}}; - var theValue = dict.GetOrDefault(100); + var theValue = dict.GetValueOrDefault(100); // Ensure the container hasn't been mutated - dict.Should().HaveCount(1).And.Contain(100, sample); + dict.Should().ContainSingle().And.Contain(100, sample); theValue.Should().Be(sample); } }