Review : remove unnecessary method ExtractDirectives

... and useless test
ite-klass · Nov 8, 2017 · f732324 · f732324
1 parent 1c3449c
commit f732324
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 26 deletions.
diff --git a/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs b/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs
@@ -83,8 +83,10 @@ public KeyValuePairSettings(IReadOnlyDictionary<string, string> settings)
         public void Configure(LoggerConfiguration loggerConfiguration)
         {
             if (loggerConfiguration == null) throw new ArgumentNullException(nameof(loggerConfiguration));
-
-            var directives = ExtractDirectives(_settings);
+
+            var directives = _settings
+                .Where(kvp => _supportedDirectives.Any(kvp.Key.StartsWith))
+                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
 
             var declaredLevelSwitches = ParseNamedLevelSwitchDeclarationDirectives(directives);
 
@@ -161,15 +163,6 @@ where matchCallables.IsMatch(wt.Key)
             }
         }
 
-        internal static IReadOnlyDictionary<string, string> ExtractDirectives(IReadOnlyDictionary<string, string> settings)
-        {
-            var directives = settings
-                .Where(kvp => _supportedDirectives.Any(kvp.Key.StartsWith))
-                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-
-            return new ReadOnlyDictionary<string, string>(directives);
-        }
-
         internal static bool IsValidSwitchName(string input)
         {
             return Regex.IsMatch(input, LevelSwitchNameRegex);

diff --git a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs
@@ -28,21 +28,7 @@ public void DuplicateKeysCauseArgumentException()
             var ex = Assert.ThrowsAny<ArgumentException>(action);
             Assert.NotNull(ex);
             Assert.Contains("An item with the same key has already been added.", ex.Message);
-        }
-
-        [Fact]
-        public void IrrelevantKeysAreIgnored()
-        {
-            var irrelevantSettings = new Dictionary<string, string>()
-            {
-                ["whatever:foo:bar"] = "willBeIgnored",
-                ["irrelevant"] = "willBeIgnored",
-            };
-
-            var directives = KeyValuePairSettings.ExtractDirectives(irrelevantSettings);
-
-            Assert.False(directives.Any());
-        }
+        }        
 
         [Fact]
         public void FindsConfigurationAssemblies()