Skip to content

Commit

Permalink
update xunit (serilog#1724)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SimonCropp @Twinki14
SimonCropp authored and Twinki14 committed Dec 30, 2023
1 parent 5e90f2d commit 1a37f89
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 20 deletions.
2 changes: 1 addition & 1 deletion test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj
View file
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs
View file
Expand Up @@ -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);
}
Expand All @@ -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>(sequenceValue.Elements[2]);
Assert.Equal(1, nested.Elements.Count);
Assert.Single(nested.Elements);
Assert.Equal(new ScalarValue("B"), nested.Elements[0]);
}

Expand Down
16 changes: 8 additions & 8 deletions test/Serilog.Tests/MethodOverloadConventionTests.cs
View file
Expand Up @@ -312,7 +312,7 @@ public void ValidateBindMessageTemplateMethods(Type loggerType)
var messageTemplateAttr = method.GetCustomAttribute<MessageTemplateFormatMethodAttribute>();

Assert.NotNull(messageTemplateAttr);
Assert.Equal(messageTemplateAttr!.MessageTemplateParameterName, MessageTemplate);
Assert.Equal(MessageTemplate, messageTemplateAttr!.MessageTemplateParameterName);

var parameters = method.GetParameters();
var index = 0;
Expand All @@ -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<LogEventProperty>).MakeByRefType());
Assert.Equal(typeof(IEnumerable<LogEventProperty>).MakeByRefType(), parameters[index].ParameterType);
Assert.True(parameters[index].IsOut);

var logger = GetLogger(loggerType);
Expand Down Expand Up @@ -685,7 +685,7 @@ static void TestForContextResult(MethodInfo method, ILogger? logger, object norm
var messageTemplateAttr = method.GetCustomAttribute<MessageTemplateFormatMethodAttribute>();

Assert.NotNull(messageTemplateAttr);
Assert.Equal(messageTemplateAttr!.MessageTemplateParameterName, MessageTemplate);
Assert.Equal(MessageTemplate, messageTemplateAttr!.MessageTemplateParameterName);
}

var signatureMatchAndInvokeSuccess = false;
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 6 additions & 8 deletions test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs
View file
Expand Up @@ -88,7 +88,7 @@ public void DoubledRightBracketsAreParsedAsASingleBracket()
AssertParsedAs("Nice }}-: mo",
new TextToken("Nice }-: mo"));
}

[Fact]
public void DoubledRightBracketsAfterOneLeftIsParsedAPropertyTokenAndATextToken()
{
Expand All @@ -104,7 +104,7 @@ public void DoubledBracketsAreParsedAsASingleBracket()
{
AssertParsedAs("{{Hi}}",
new TextToken("{Hi}"));

AssertParsedAs("Hello, {{worl@d}}!",
new TextToken("Hello, {worl@d}!"));
}
Expand All @@ -117,7 +117,7 @@ public void AMalformedPropertyTagIsParsedAsText()

AssertParsedAs("{0 space",
new TextToken("{0 space"));

AssertParsedAs("{0_space",
new TextToken("{0_space"));
}
Expand All @@ -139,7 +139,7 @@ public void AMalformedPropertyTagIsParsedAsText3()
new PropertyToken("0_", "{0_}"),
new TextToken("}space}"));
}

[Fact]
public void AMessageWithAMalformedPropertyTagIsParsedAsManyTextTokens()
{
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -212,7 +212,6 @@ public void ManyIntegerPropertyNameIsParsedAsPositionalProperty()
Assert.Equal(3, prop5.Length);
}


[Fact]
public void InvalidIntegerPropertyNameIsParsedAsText()
{
Expand Down Expand Up @@ -280,7 +279,6 @@ public void PropertiesCanHaveRightAlignment()
Assert.Equal(new Alignment(AlignmentDirection.Right, 50), prop2.Alignment);
}


[Fact]
public void PropertiesCanHaveAlignmentAndFormat()
{
Expand Down
2 changes: 1 addition & 1 deletion test/Serilog.Tests/Serilog.Tests.csproj
View file
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

Expand Down

0 comments on commit 1a37f89

Please sign in to comment.