From 1a37f89200e656fccc3fc984b765bd0256bc5c76 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Tue, 9 Aug 2022 18:03:39 +1000 Subject: [PATCH] update xunit (#1724) --- .../Serilog.PerformanceTests.csproj | 2 +- .../Capturing/PropertyValueConverterTests.cs | 4 ++-- .../MethodOverloadConventionTests.cs | 16 ++++++++-------- .../Parsing/MessageTemplateParserTests.cs | 14 ++++++-------- test/Serilog.Tests/Serilog.Tests.csproj | 2 +- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj index 17e7636d4..21946e7ce 100644 --- a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj +++ b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj @@ -16,7 +16,7 @@ - + diff --git a/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs b/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs index 31fc336c7..e50c79b5a 100644 --- a/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs +++ b/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs @@ -347,7 +347,7 @@ public void ItemPropertiesNotAreIgnoredWhenDestructuring() { var indexed = new HasItem(); var pv = (StructureValue)_converter.CreatePropertyValue(indexed, true); - Assert.Equal(1, pv.Properties.Count); + Assert.Single(pv.Properties); var item = pv.Properties.Single(); Assert.Equal("Item", item.Name); } @@ -374,7 +374,7 @@ public void ValueTuplesAreRecognizedWhenDestructuring() Assert.Equal(new ScalarValue(1), sequenceValue.Elements[0]); Assert.Equal(new ScalarValue("A"), sequenceValue.Elements[1]); var nested = Assert.IsType(sequenceValue.Elements[2]); - Assert.Equal(1, nested.Elements.Count); + Assert.Single(nested.Elements); Assert.Equal(new ScalarValue("B"), nested.Elements[0]); } diff --git a/test/Serilog.Tests/MethodOverloadConventionTests.cs b/test/Serilog.Tests/MethodOverloadConventionTests.cs index 8c01c5b93..6c18fed87 100644 --- a/test/Serilog.Tests/MethodOverloadConventionTests.cs +++ b/test/Serilog.Tests/MethodOverloadConventionTests.cs @@ -312,7 +312,7 @@ public void ValidateBindMessageTemplateMethods(Type loggerType) var messageTemplateAttr = method.GetCustomAttribute(); Assert.NotNull(messageTemplateAttr); - Assert.Equal(messageTemplateAttr!.MessageTemplateParameterName, MessageTemplate); + Assert.Equal(MessageTemplate, messageTemplateAttr!.MessageTemplateParameterName); var parameters = method.GetParameters(); var index = 0; @@ -326,12 +326,12 @@ public void ValidateBindMessageTemplateMethods(Type loggerType) index++; Assert.Equal("parsedTemplate", parameters[index].Name); - Assert.Equal(parameters[index].ParameterType, typeof(MessageTemplate).MakeByRefType()); + Assert.Equal(typeof(MessageTemplate).MakeByRefType(), parameters[index].ParameterType); Assert.True(parameters[index].IsOut); index++; Assert.Equal("boundProperties", parameters[index].Name); - Assert.Equal(parameters[index].ParameterType, typeof(IEnumerable).MakeByRefType()); + Assert.Equal(typeof(IEnumerable).MakeByRefType(), parameters[index].ParameterType); Assert.True(parameters[index].IsOut); var logger = GetLogger(loggerType); @@ -685,7 +685,7 @@ static void TestForContextResult(MethodInfo method, ILogger? logger, object norm var messageTemplateAttr = method.GetCustomAttribute(); Assert.NotNull(messageTemplateAttr); - Assert.Equal(messageTemplateAttr!.MessageTemplateParameterName, MessageTemplate); + Assert.Equal(MessageTemplate, messageTemplateAttr!.MessageTemplateParameterName); } var signatureMatchAndInvokeSuccess = false; @@ -934,7 +934,7 @@ static void VerifyMethodSignature(MethodInfo method, bool hasExceptionArg = fals //check for message template string argument Assert.Equal(typeof(string), parameters[index].ParameterType); - Assert.Equal(parameters[index].Name, MessageTemplate); + Assert.Equal(MessageTemplate, parameters[index].Name); index++; if (isGeneric) //validate type arguments, generic parameters, and cross-reference @@ -948,13 +948,13 @@ static void VerifyMethodSignature(MethodInfo method, bool hasExceptionArg = fals { for (var i = 0; i < genericTypeArgs.Length; i++, index++) { - Assert.Equal(genericTypeArgs[i].Name, $"T{i}"); + Assert.Equal($"T{i}", genericTypeArgs[i].Name); var genericConstraints = genericTypeArgs[i].GetTypeInfo().GetGenericParameterConstraints(); Assert.Empty(genericConstraints); - Assert.Equal(parameters[index].Name, $"propertyValue{i}"); - Assert.Equal(parameters[index].ParameterType, genericTypeArgs[i]); + Assert.Equal($"propertyValue{i}", parameters[index].Name); + Assert.Equal(genericTypeArgs[i], parameters[index].ParameterType); } } else //single generic argument convention T : T propertyValue diff --git a/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs b/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs index 3d899e4d7..05e6b7eee 100644 --- a/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs +++ b/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs @@ -88,7 +88,7 @@ public void DoubledRightBracketsAreParsedAsASingleBracket() AssertParsedAs("Nice }}-: mo", new TextToken("Nice }-: mo")); } - + [Fact] public void DoubledRightBracketsAfterOneLeftIsParsedAPropertyTokenAndATextToken() { @@ -104,7 +104,7 @@ public void DoubledBracketsAreParsedAsASingleBracket() { AssertParsedAs("{{Hi}}", new TextToken("{Hi}")); - + AssertParsedAs("Hello, {{worl@d}}!", new TextToken("Hello, {worl@d}!")); } @@ -117,7 +117,7 @@ public void AMalformedPropertyTagIsParsedAsText() AssertParsedAs("{0 space", new TextToken("{0 space")); - + AssertParsedAs("{0_space", new TextToken("{0_space")); } @@ -139,7 +139,7 @@ public void AMalformedPropertyTagIsParsedAsText3() new PropertyToken("0_", "{0_}"), new TextToken("}space}")); } - + [Fact] public void AMessageWithAMalformedPropertyTagIsParsedAsManyTextTokens() { @@ -186,7 +186,7 @@ public void ManyIntegerPropertyNameIsParsedAsPositionalProperty() Assert.True(prop1.IsPositional); Assert.Equal(0, prop1.StartIndex); Assert.Equal(3, prop1.Length); - + var prop2 = (TextToken)parsed[1]; Assert.Equal(", ", prop2.Text); Assert.Equal(3, prop2.StartIndex); @@ -198,7 +198,7 @@ public void ManyIntegerPropertyNameIsParsedAsPositionalProperty() Assert.True(prop3.IsPositional); Assert.Equal(5, prop3.StartIndex); Assert.Equal(3, prop3.Length); - + var prop4 = (TextToken)parsed[3]; Assert.Equal(", ", prop4.Text); Assert.Equal(8, prop4.StartIndex); @@ -212,7 +212,6 @@ public void ManyIntegerPropertyNameIsParsedAsPositionalProperty() Assert.Equal(3, prop5.Length); } - [Fact] public void InvalidIntegerPropertyNameIsParsedAsText() { @@ -280,7 +279,6 @@ public void PropertiesCanHaveRightAlignment() Assert.Equal(new Alignment(AlignmentDirection.Right, 50), prop2.Alignment); } - [Fact] public void PropertiesCanHaveAlignmentAndFormat() { diff --git a/test/Serilog.Tests/Serilog.Tests.csproj b/test/Serilog.Tests/Serilog.Tests.csproj index 9e1cd0961..401f35644 100644 --- a/test/Serilog.Tests/Serilog.Tests.csproj +++ b/test/Serilog.Tests/Serilog.Tests.csproj @@ -16,7 +16,7 @@ - +