Skip to content

Commit e2b3dcf

Browse files
committed
update test refs
1 parent 6ece355 commit e2b3dcf

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Tests/Directory.Build.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
1111

1212
<ItemGroup Label="Package References">
13-
<PackageReference Include="coverlet.collector" PrivateAssets="All" Version="6.0.2">
13+
<PackageReference Include="coverlet.collector" PrivateAssets="All" Version="6.0.4">
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="JunitXml.TestLogger" Version="4.1.0" />
16+
<PackageReference Include="JunitXml.TestLogger" Version="5.0.0" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1818
<PackageReference Include="Moq" Version="4.20.72" />
19-
<PackageReference Include="xunit" Version="2.9.2" />
20-
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.8.2">
19+
<PackageReference Include="xunit" Version="2.9.3" />
20+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="3.0.2">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2222
</PackageReference>
2323
</ItemGroup>

Tests/Serilog.Exceptions.Test/Destructurers/ReflectionBasedDestructurerTest.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public async Task CanDestructureTaskAsync()
9494

9595
var properties = propertiesBag.GetResultDictionary();
9696
var destructuredTaskObject = (IDictionary?)properties[nameof(TaskCanceledException.Task)];
97-
var destructuredTaskProperties = Assert.IsAssignableFrom<IDictionary<string, object>>(destructuredTaskObject);
97+
var destructuredTaskProperties = Assert.IsType<IDictionary<string, object>>(destructuredTaskObject, exactMatch: false);
9898
Assert.Contains(nameof(Task.Id), destructuredTaskProperties.Keys);
9999

100100
Assert.Contains(nameof(Task.Status), destructuredTaskProperties.Keys);
@@ -118,7 +118,7 @@ public void CanDestructureFaultedTask()
118118

119119
var properties = propertiesBag.GetResultDictionary();
120120
var destructuredTaskObject = (IDictionary?)properties[nameof(TaskCanceledException.Task)];
121-
var destructuredTaskProperties = Assert.IsAssignableFrom<IDictionary<string, object>>(destructuredTaskObject);
121+
var destructuredTaskProperties = Assert.IsType<IDictionary<string, object>>(destructuredTaskObject, exactMatch: false);
122122
Assert.Contains(nameof(Task.Id), destructuredTaskProperties.Keys);
123123

124124
Assert.Contains(nameof(Task.Status), destructuredTaskProperties.Keys);
@@ -130,17 +130,17 @@ public void CanDestructureFaultedTask()
130130
Assert.Equal(nameof(TaskCreationOptions.None), creationOptions);
131131

132132
Assert.Contains(nameof(Task.Exception), destructuredTaskProperties.Keys);
133-
var taskFirstLevelExceptionDictionary = Assert.IsAssignableFrom<IDictionary<string, object>>(destructuredTaskProperties[nameof(Task.Exception)]);
133+
var taskFirstLevelExceptionDictionary = Assert.IsType<IDictionary<string, object>>(destructuredTaskProperties[nameof(Task.Exception)], exactMatch: false);
134134
Assert.Equal(nameof(TaskCreationOptions.None), creationOptions);
135135

136136
Assert.Contains("Message", taskFirstLevelExceptionDictionary.Keys);
137137
var message = Assert.IsType<string>(taskFirstLevelExceptionDictionary["Message"]);
138138
Assert.Equal("One or more errors occurred. (INNER EXCEPTION MESSAGE)", message);
139139

140140
Assert.Contains("InnerExceptions", taskFirstLevelExceptionDictionary.Keys);
141-
var innerExceptions = Assert.IsAssignableFrom<IReadOnlyCollection<object>>(taskFirstLevelExceptionDictionary["InnerExceptions"]);
141+
var innerExceptions = Assert.IsType<IReadOnlyCollection<object>>(taskFirstLevelExceptionDictionary["InnerExceptions"], exactMatch: false);
142142
var innerException = Assert.Single(innerExceptions);
143-
var innerExceptionDictionary = Assert.IsAssignableFrom<IDictionary<string, object>>(innerException);
143+
var innerExceptionDictionary = Assert.IsType<IDictionary<string, object>>(innerException, exactMatch: false);
144144
Assert.Contains("Message", innerExceptionDictionary.Keys);
145145
Assert.Equal("INNER EXCEPTION MESSAGE", innerExceptionDictionary["Message"]);
146146
}
@@ -161,7 +161,7 @@ public void CanDestructureStructDataItem()
161161
var properties = propertiesBag.GetResultDictionary();
162162
var data = (IDictionary?)properties[nameof(Exception.Data)];
163163
var testStructDataValue = data?["data"];
164-
Assert.IsAssignableFrom<TestStruct>(testStructDataValue);
164+
Assert.IsType<TestStruct>(testStructDataValue, exactMatch: false);
165165
}
166166

167167
[Fact]
@@ -180,7 +180,7 @@ public void CanDestructureClassDataItem()
180180
var properties = propertiesBag.GetResultDictionary();
181181
var data = (IDictionary?)properties[nameof(Exception.Data)];
182182
var testStructDataValue = data?["data"];
183-
var destructuredStructDictionary = Assert.IsAssignableFrom<IDictionary<string, object>>(testStructDataValue);
183+
var destructuredStructDictionary = Assert.IsType<IDictionary<string, object>>(testStructDataValue, exactMatch: false);
184184
Assert.Equal(10, destructuredStructDictionary[nameof(TestClass.ValueType)]);
185185
Assert.Equal("ABC", destructuredStructDictionary[nameof(TestClass.ReferenceType)]);
186186
}
@@ -319,20 +319,20 @@ public void WhenObjectContainsCyclicReferencesInTask_ThenRecursiveDestructureIsI
319319
destructurer.Destructure(exception, result, InnerDestructurer(destructurer));
320320

321321
var resultsDictionary = result.GetResultDictionary();
322-
var destructuredTask = Assert.IsAssignableFrom<IDictionary<string, object>>(resultsDictionary[nameof(CyclicTaskException.Task)]);
322+
var destructuredTask = Assert.IsType<IDictionary<string, object>>(resultsDictionary[nameof(CyclicTaskException.Task)], exactMatch: false);
323323
Assert.Contains(nameof(Task.Exception), destructuredTask.Keys);
324-
var exceptionDictionary = Assert.IsAssignableFrom<IDictionary<string, object>>(destructuredTask[nameof(Task.Exception)]);
324+
var exceptionDictionary = Assert.IsType<IDictionary<string, object>>(destructuredTask[nameof(Task.Exception)], exactMatch: false);
325325
Assert.Contains(nameof(AggregateException.InnerExceptions), exceptionDictionary.Keys);
326-
var innerExceptions = Assert.IsAssignableFrom<IReadOnlyCollection<object>>(exceptionDictionary[nameof(AggregateException.InnerExceptions)]);
326+
var innerExceptions = Assert.IsType<IReadOnlyCollection<object>>(exceptionDictionary[nameof(AggregateException.InnerExceptions)], exactMatch: false);
327327
var innerException = Assert.Single(innerExceptions);
328-
var destructuredCyclicException = Assert.IsAssignableFrom<IDictionary<string, object>>(innerException);
328+
var destructuredCyclicException = Assert.IsType<IDictionary<string, object>>(innerException, exactMatch: false);
329329

330330
Assert.Contains(nameof(Exception.Message), destructuredCyclicException.Keys);
331331
var message = Assert.IsType<string>(destructuredCyclicException[nameof(Exception.Message)]);
332332
Assert.Contains(nameof(CyclicTaskException), message, StringComparison.Ordinal);
333333

334334
Assert.Contains(nameof(CyclicTaskException.Task), destructuredCyclicException.Keys);
335-
var task2 = Assert.IsAssignableFrom<IDictionary<string, object>>(destructuredCyclicException[nameof(CyclicTaskException.Task)]);
335+
var task2 = Assert.IsType<IDictionary<string, object>>(destructuredCyclicException[nameof(CyclicTaskException.Task)], exactMatch: false);
336336
Assert.Contains("$ref", task2);
337337
}
338338

0 commit comments

Comments
 (0)