Merge branch 'master' of github.com:aaubry/YamlDotNet into ec-fixes

aaubry · Sep 26, 2024 · 1391f0d · 1391f0d
2 parents 532f128 + c664e43
commit 1391f0d
Show file tree

Hide file tree

Showing 48 changed files with 99 additions and 118 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,13 +7,13 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="Bullseye" Version="4.1.1" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="FakeItEasy" Version="6.2.1" />
-    <PackageVersion Include="FluentAssertions" Version="4.19.2" />
+    <PackageVersion Include="FakeItEasy" Version="8.3.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
     <PackageVersion Include="FSharp.Core" Version="8.0.400" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="ObjectLayoutInspector" Version="0.1.2" />
     <PackageVersion Include="SimpleExec" Version="12.0.0" />

diff --git a/YamlDotNet.Test/Core/EmitterTests.cs b/YamlDotNet.Test/Core/EmitterTests.cs
@@ -57,10 +57,11 @@ public void CompareOriginalAndEmittedText(string filename)
             var emittedText = EmittedTextFrom(originalEvents);
             var emittedEvents = ParsingEventsOf(emittedText);
 
-            emittedEvents.ShouldAllBeEquivalentTo(originalEvents,
-                opt => opt.Excluding(@event => @event.Start)
-                          .Excluding(@event => @event.End)
-                          .Excluding((ParsingEvent @event) => ((DocumentEnd)@event).IsImplicit));
+            emittedEvents.Should().BeEquivalentTo(originalEvents, opt => opt
+                .Excluding(@event => @event.Start)
+                .Excluding(@event => @event.End)
+                .Excluding(@event => ((DocumentEnd)@event).IsImplicit)
+            );
         }
 
         private IList<ParsingEvent> ParsingEventsOf(string text)

diff --git a/YamlDotNet.Test/Core/InsertionQueueTests.cs b/YamlDotNet.Test/Core/InsertionQueueTests.cs
@@ -267,7 +267,7 @@ public void ShouldThrowExceptionWhenDequeuingEmptyContainer()
 
             Action action = () => queue.Dequeue();
 
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -279,7 +279,7 @@ public void ShouldThrowExceptionWhenDequeuingContainerThatBecomesEmpty()
             queue.Dequeue();
             Action action = () => queue.Dequeue();
 
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -314,7 +314,7 @@ public void ShouldThrowExceptionWhenDequeuingAfterInserting()
             PerformTimes(2, queue.Dequeue);
             Action action = () => queue.Dequeue();
 
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]

diff --git a/YamlDotNet.Test/Core/LookAheadBufferTests.cs b/YamlDotNet.Test/Core/LookAheadBufferTests.cs
@@ -206,7 +206,7 @@ public void ShouldThrowWhenSkippingBeyondCurrentBuffer()
             buffer.Peek(3);
             Action action = () => buffer.Skip(5);
 
-            action.ShouldThrow<ArgumentOutOfRangeException>();
+            action.Should().Throw<ArgumentOutOfRangeException>();
         }
 
         private static LookAheadBuffer CreateBuffer(TextReader reader, int capacity)

diff --git a/YamlDotNet.Test/RepresentationModel/YamlStreamTests.cs b/YamlDotNet.Test/RepresentationModel/YamlStreamTests.cs
@@ -29,7 +29,6 @@
 using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.RepresentationModel;
-using YamlDotNet.Serialization.Schemas;
 
 namespace YamlDotNet.Test.RepresentationModel
 {
@@ -57,7 +56,7 @@ public void AccessingAllNodesOnInfinitelyRecursiveDocumentThrows(string yaml)
 
             var accessAllNodes = new Action(() => stream.Documents.Single().AllNodes.ToList());
 
-            accessAllNodes.ShouldThrow<MaximumRecursionLevelReachedException>("because the document is infinitely recursive.");
+            accessAllNodes.Should().Throw<MaximumRecursionLevelReachedException>("because the document is infinitely recursive.");
         }
 
         [Theory]

diff --git a/YamlDotNet.Test/Serialization/BufferedDeserialization/KeyValueTypeDiscriminatorTests.cs b/YamlDotNet.Test/Serialization/BufferedDeserialization/KeyValueTypeDiscriminatorTests.cs
@@ -21,10 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using FluentAssertions;
 using Xunit;
-using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 

diff --git a/...Net.Test/Serialization/BufferedDeserialization/TypeDiscriminatingNodeDeserializerTests.cs b/...Net.Test/Serialization/BufferedDeserialization/TypeDiscriminatingNodeDeserializerTests.cs
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using FluentAssertions;
 using Xunit;
 using YamlDotNet.Core;
@@ -47,10 +46,10 @@ public void TypeDiscriminatingNodeDeserializer_ThrowsWhen_MaxDepthExceeded()
 
             Action act = () => bufferedDeserializer.Deserialize<object>(KubernetesServiceYaml);
             act
-              .ShouldThrow<YamlException>()
+              .Should().Throw<YamlException>()
               .WithMessage("Failed to buffer yaml node")
               .WithInnerException<ArgumentOutOfRangeException>()
-              .Where(e => e.InnerException.Message.Contains("Parser buffer exceeded max depth"));
+              .WithMessage("Parser buffer exceeded max depth*");
         }
 
         [Fact]
@@ -68,10 +67,10 @@ public void TypeDiscriminatingNodeDeserializer_ThrowsWhen_MaxLengthExceeded()
 
             Action act = () => bufferedDeserializer.Deserialize<object>(KubernetesServiceYaml);
             act
-              .ShouldThrow<YamlException>()
+              .Should().Throw<YamlException>()
               .WithMessage("Failed to buffer yaml node")
               .WithInnerException<ArgumentOutOfRangeException>()
-              .Where(e => e.InnerException.Message.Contains("Parser buffer exceeded max length"));
+              .WithMessage("Parser buffer exceeded max length*");
         }
 
         public const string KubernetesServiceYaml = @"

diff --git a/YamlDotNet.Test/Serialization/BufferedDeserialization/UniqueKeyTypeDiscriminatorTests.cs b/YamlDotNet.Test/Serialization/BufferedDeserialization/UniqueKeyTypeDiscriminatorTests.cs
@@ -21,10 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using FluentAssertions;
 using Xunit;
-using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 

diff --git a/YamlDotNet.Test/Serialization/DateOnlyConverterTests.cs b/YamlDotNet.Test/Serialization/DateOnlyConverterTests.cs
@@ -75,7 +75,7 @@ public void Given_Yaml_WithInvalidDateTimeFormat_WithDefaultParameter_ReadYaml_S
 
             Action action = () => { converter.ReadYaml(parser, typeof(DateOnly), null); };
 
-            action.ShouldThrow<FormatException>();
+            action.Should().Throw<FormatException>();
         }
 
         /// <summary>

diff --git a/YamlDotNet.Test/Serialization/DateTime8601ConverterTests.cs b/YamlDotNet.Test/Serialization/DateTime8601ConverterTests.cs
@@ -20,11 +20,6 @@
 // SOFTWARE.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FakeItEasy;
 using Xunit;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;

diff --git a/YamlDotNet.Test/Serialization/DateTimeConverterTests.cs b/YamlDotNet.Test/Serialization/DateTimeConverterTests.cs
@@ -74,7 +74,7 @@ public void Given_Yaml_WithInvalidDateTimeFormat_WithDefaultParameters_ReadYaml_
 
             Action action = () => { converter.ReadYaml(parser, typeof(DateTime), null); };
 
-            action.ShouldThrow<FormatException>();
+            action.Should().Throw<FormatException>();
         }
 
         /// <summary>

diff --git a/YamlDotNet.Test/Serialization/DateTimeOffsetConverterTests.cs b/YamlDotNet.Test/Serialization/DateTimeOffsetConverterTests.cs
@@ -66,7 +66,7 @@ public void InvalidFormatThrowsException()
 
             Action action = () => { converter.ReadYaml(parser, typeof(DateTimeOffset), null); };
 
-            action.ShouldThrow<FormatException>();
+            action.Should().Throw<FormatException>();
         }
 
         [Fact]

diff --git a/YamlDotNet.Test/Serialization/DeserializerTest.cs b/YamlDotNet.Test/Serialization/DeserializerTest.cs
@@ -301,14 +301,14 @@ public void DeserializeWithDuplicateKeyChecking_YamlWithDuplicateKeys_ThrowsYaml
                 .Build();
 
             Action act = () => sut.Deserialize<Person>(yaml);
-            act.ShouldThrow<YamlException>("Because there are duplicate name keys with concrete class");
+            act.Should().Throw<YamlException>("Because there are duplicate name keys with concrete class");
             act = () => sut.Deserialize<IDictionary<object, object>>(yaml);
-            act.ShouldThrow<YamlException>("Because there are duplicate name keys with dictionary");
+            act.Should().Throw<YamlException>("Because there are duplicate name keys with dictionary");
 
             var stream = Yaml.ReaderFrom("backreference.yaml");
             var parser = new MergingParser(new Parser(stream));
             act = () => sut.Deserialize<Dictionary<string, Dictionary<string, string>>>(parser);
-            act.ShouldThrow<YamlException>("Because there are duplicate name keys with merging parser");
+            act.Should().Throw<YamlException>("Because there are duplicate name keys with merging parser");
         }
 
         [Fact]
@@ -325,14 +325,14 @@ public void DeserializeWithoutDuplicateKeyChecking_YamlWithDuplicateKeys_DoesNot
                 .Build();
 
             Action act = () => sut.Deserialize<Person>(yaml);
-            act.ShouldNotThrow<YamlException>("Because duplicate key checking is not enabled");
+            act.Should().NotThrow<YamlException>("Because duplicate key checking is not enabled");
             act = () => sut.Deserialize<IDictionary<object, object>>(yaml);
-            act.ShouldNotThrow<YamlException>("Because duplicate key checking is not enabled");
+            act.Should().NotThrow<YamlException>("Because duplicate key checking is not enabled");
 
             var stream = Yaml.ReaderFrom("backreference.yaml");
             var parser = new MergingParser(new Parser(stream));
             act = () => sut.Deserialize<Dictionary<string, Dictionary<string, string>>>(parser);
-            act.ShouldNotThrow<YamlException>("Because duplicate key checking is not enabled");
+            act.Should().NotThrow<YamlException>("Because duplicate key checking is not enabled");
         }
 
         [Fact]

diff --git a/YamlDotNet.Test/Serialization/HiddenPropertyTests.cs b/YamlDotNet.Test/Serialization/HiddenPropertyTests.cs
@@ -94,7 +94,7 @@ public void TestDuplicate()
                 .Build();
 
             Action action = () => { d.Deserialize<DuplicatePropertyDerived<string>>(yaml); };
-            action.ShouldThrow<YamlException>();
+            action.Should().Throw<YamlException>();
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ public void InvalidFormatThrowsException() @@
                 Action action = () => { converter.ReadYaml(parser, typeof(DateTimeOffset), null); };
-                action.ShouldThrow<FormatException>();
+                action.Should().Throw<FormatException>();
             }
             [Fact]
@@ Expand Down @@