minor cleanups (#1746)

serilog · Sep 5, 2022 · e0c533d · e0c533d
1 parent 70e729d
commit e0c533d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/src/Serilog/ILogger.cs b/src/Serilog/ILogger.cs
@@ -65,7 +65,7 @@ ILogger ForContext(IEnumerable<ILogEventEnricher> enrichers)
         if (enrichers == null)
             return this; // No context here, so little point writing to SelfLog.
 
-        return ForContext(new Core.Enrichers.SafeAggregateEnricher(enrichers));
+        return ForContext(new SafeAggregateEnricher(enrichers));
     }
 #else
         ;

diff --git a/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs b/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs
@@ -164,7 +164,7 @@ public void ByDefaultANonScalarDictionaryIsASequenceValue()
     [Fact]
     public void DelegatesAreConvertedToScalarStringsWhenDestructuring()
     {
-        Action del = DelegatesAreConvertedToScalarStringsWhenDestructuring;
+        var del = DelegatesAreConvertedToScalarStringsWhenDestructuring;
         var pv = _converter.CreatePropertyValue(del, Destructuring.Destructure);
         Assert.IsType<ScalarValue>(pv);
         Assert.IsType<string>(pv.LiteralValue());
@@ -236,7 +236,6 @@ public void FailsGracefullyWhenAccessingPropertiesViaReflectionThrows()
             Assert.Equal(3, l.Value.LiteralValue());
             var k = sv.Properties.Single(m => m.Name == "IsEmpty");
             Assert.False((bool?)k.Value.LiteralValue());
-            var s = sv.Properties.Single(m => m.Name == "Span");
         }
 #endif
 
@@ -266,13 +265,13 @@ public void SurvivesDestructuringASystemType()
     }
 
 #if GETCURRENTMETHOD
-        [Fact]
-        public void SurvivesDestructuringMethodBase()
-        {
-            var theMethod = System.Reflection.MethodBase.GetCurrentMethod();
-            var pv = _converter.CreatePropertyValue(theMethod, Destructuring.Destructure);
-            Assert.Equal(theMethod, pv.LiteralValue());
-        }
+    [Fact]
+    public void SurvivesDestructuringMethodBase()
+    {
+        var theMethod = MethodBase.GetCurrentMethod();
+        var pv = _converter.CreatePropertyValue(theMethod, Destructuring.Destructure);
+        Assert.Equal(theMethod, pv.LiteralValue());
+    }
 #endif
 
     public class BaseWithProps

diff --git a/test/Serilog.Tests/Data/LogEventPropertyValueRewriterTests.cs b/test/Serilog.Tests/Data/LogEventPropertyValueRewriterTests.cs
@@ -9,8 +9,7 @@ public LogEventPropertyValue LimitStringLength(LogEventPropertyValue value, int
 
     protected override LogEventPropertyValue VisitScalarValue(int state, ScalarValue scalar)
     {
-        var str = scalar.Value as string;
-        if (str == null || str.Length <= state)
+        if (scalar.Value is not string str || str.Length <= state)
             return scalar;
 
         return new ScalarValue(str.Substring(0, state));

diff --git a/test/Serilog.Tests/Debugging/SelfLogTests.cs b/test/Serilog.Tests/Debugging/SelfLogTests.cs
@@ -11,7 +11,6 @@ public void MessagesAreWrittenWhenOutputIsSet()
         Messages = new();
         SelfLog.Enable(m =>
         {
-            Messages ??= new();
             Messages.Add(m);
         });
 
@@ -32,7 +31,6 @@ public void WritingToUndeclaredSinkWritesToSelfLog()
         Messages = new();
         SelfLog.Enable(m =>
         {
-            Messages ??= new();
             Messages.Add(m);
         });
 

diff --git a/test/Serilog.Tests/Filters/MatchingTests.cs b/test/Serilog.Tests/Filters/MatchingTests.cs
@@ -58,7 +58,7 @@ public void SourceFiltersSkipNonNamespaces()
             .Filter.ByExcluding(Matching.FromSource("Serilog.Tests"))
             .WriteTo.Sink(new DelegatingSink(_ => written = true))
             .CreateLogger()
-            .ForContext(Serilog.Core.Constants.SourceContextPropertyName, "Serilog.TestsLong");
+            .ForContext(Constants.SourceContextPropertyName, "Serilog.TestsLong");
 
         log.Write(Some.InformationEvent());
         Assert.True(written);

diff --git a/test/Serilog.Tests/MethodOverloadConventionTests.cs b/test/Serilog.Tests/MethodOverloadConventionTests.cs
@@ -958,12 +958,12 @@ static void VerifyMethodSignature(MethodInfo method, bool hasExceptionArg = fals
 
             //check for params argument: params object[] propertyValues
             //params argument currently has to be the last argument, and generic methods don't have params argument
-            if (!isGeneric && (parameters.Length - index) == 1)
+            if (!isGeneric && parameters.Length - index == 1)
             {
                 var paramsArrayArg = parameters[index];
 
                 // params array attribute should never have derived/inherited classes
-                var paramsAttr = parameters[index].GetCustomAttribute(typeof(ParamArrayAttribute), inherit: false);
+                var paramsAttr = paramsArrayArg.GetCustomAttribute(typeof(ParamArrayAttribute), inherit: false);
 
                 Assert.NotNull(paramsAttr);
                 Assert.Equal(typeof(object[]), paramsArrayArg.ParameterType);