Migrate tests to Shouldly

destructurama · Jan 23, 2024 · 9ae9847 · 9ae9847
1 parent fca7d07
commit 9ae9847
Show file tree

Hide file tree

Showing 6 changed files with 287 additions and 291 deletions.
diff --git a/src/Destructurama.Attributed.Tests/AttributedDestructuringTests.cs b/src/Destructurama.Attributed.Tests/AttributedDestructuringTests.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using Serilog;
 using Serilog.Events;
+using Shouldly;
 
 namespace Destructurama.Attributed.Tests;
 
@@ -37,17 +38,17 @@ public void AttributesAreConsultedWhenDestructuring()
         var sv = (StructureValue)evt.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsInstanceOf<ImmutableScalar>(props["ImmutableScalar"].LiteralValue());
-        Assert.AreEqual(new MutableScalar().ToString(), props["MutableScalar"].LiteralValue());
-        Assert.IsInstanceOf<StructureValue>(props["NotAScalar"]);
-        Assert.IsFalse(props.ContainsKey("Ignored"));
-        Assert.IsInstanceOf<NotAScalar>(props["ScalarAnyway"].LiteralValue());
-        Assert.IsInstanceOf<Struct1>(props["Struct1"].LiteralValue());
-        Assert.IsInstanceOf<Struct2>(props["Struct2"].LiteralValue());
+        props["ImmutableScalar"].LiteralValue().ShouldBeOfType<ImmutableScalar>();
+        props["MutableScalar"].LiteralValue().ShouldBe(new MutableScalar().ToString());
+        props["NotAScalar"].ShouldBeOfType<StructureValue>();
+        props.ContainsKey("Ignored").ShouldBeFalse();
+        props["ScalarAnyway"].LiteralValue().ShouldBeOfType<NotAScalar>();
+        props["Struct1"].LiteralValue().ShouldBeOfType<Struct1>();
+        props["Struct2"].LiteralValue().ShouldBeOfType<Struct2>();
 
         var str = sv.ToString();
-        Assert.That(str.Contains("This is a username"));
-        Assert.False(str.Contains("This is a password"));
+        str.Contains("This is a username").ShouldBeTrue();
+        str.Contains("This is a password").ShouldBeFalse();
     }
 
     [LogAsScalar]

diff --git a/src/Destructurama.Attributed.Tests/IgnoreNullPropertiesTests.cs b/src/Destructurama.Attributed.Tests/IgnoreNullPropertiesTests.cs
@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using Serilog;
 using Serilog.Events;
+using Shouldly;
 
 namespace Destructurama.Attributed.Tests;
 
@@ -162,17 +163,17 @@ public void NotLoggedIfNull_Uninitialized()
         var sv = (StructureValue)evt!.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsTrue(props.ContainsKey("Integer"));
-        Assert.IsTrue(props.ContainsKey("DateTime"));
-        Assert.IsTrue(props.ContainsKey("Struct"));
-        Assert.IsTrue(props.ContainsKey("StructPartiallyInitialized"));
-
-        Assert.IsFalse(props.ContainsKey("String"));
-        Assert.IsFalse(props.ContainsKey("NullableInteger"));
-        Assert.IsFalse(props.ContainsKey("IntegerAsObject"));
-        Assert.IsFalse(props.ContainsKey("Object"));
-        Assert.IsFalse(props.ContainsKey("NullableDateTime"));
-        Assert.IsFalse(props.ContainsKey("NullableStruct"));
+        props.ContainsKey("Integer").ShouldBeTrue();
+        props.ContainsKey("DateTime").ShouldBeTrue();
+        props.ContainsKey("Struct").ShouldBeTrue();
+        props.ContainsKey("StructPartiallyInitialized").ShouldBeTrue();
+
+        props.ContainsKey("String").ShouldBeFalse();
+        props.ContainsKey("NullableInteger").ShouldBeFalse();
+        props.ContainsKey("IntegerAsObject").ShouldBeFalse();
+        props.ContainsKey("Object").ShouldBeFalse();
+        props.ContainsKey("NullableDateTime").ShouldBeFalse();
+        props.ContainsKey("NullableStruct").ShouldBeFalse();
     }
 
     [Test]
@@ -223,54 +224,52 @@ public void NotLoggedIfNull_Initialized()
         var sv = (StructureValue)evt!.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsTrue(props.ContainsKey("String"));
-        Assert.IsTrue(props.ContainsKey("Integer"));
-        Assert.IsTrue(props.ContainsKey("NullableInteger"));
-        Assert.IsTrue(props.ContainsKey("Object"));
-        Assert.IsTrue(props.ContainsKey("IntegerAsObject"));
-        Assert.IsTrue(props.ContainsKey("DateTime"));
-        Assert.IsTrue(props.ContainsKey("NullableDateTime"));
-        Assert.IsTrue(props.ContainsKey("Struct"));
-        Assert.IsTrue(props.ContainsKey("NullableStruct"));
-        Assert.IsTrue(props.ContainsKey("StructPartiallyInitialized"));
-
-        Assert.AreEqual("Foo", props["String"].LiteralValue());
-        Assert.AreEqual(10, props["Integer"].LiteralValue());
-        Assert.AreEqual(5, props["NullableInteger"].LiteralValue());
-        Assert.AreEqual("Bar", props["Object"].LiteralValue());
-        Assert.AreEqual(0, props["IntegerAsObject"].LiteralValue());
-        Assert.AreEqual(dateTime, props["DateTime"].LiteralValue());
-        Assert.AreEqual(dateTime, props["NullableDateTime"].LiteralValue());
-        Assert.IsInstanceOf<StructureValue>(props["Struct"]);
-        Assert.IsInstanceOf<StructureValue>(props["NullableStruct"]);
-        Assert.IsInstanceOf<StructureValue>(props["StructPartiallyInitialized"]);
-
-        var structProps = ((StructureValue)props["Struct"]).Properties
-            .ToDictionary(p => p.Name, p => p.Value);
-
-        Assert.IsTrue(structProps.ContainsKey("Integer"));
-        Assert.IsTrue(structProps.ContainsKey("NullableInteger"));
-        Assert.IsTrue(structProps.ContainsKey("DateTime"));
-        Assert.IsTrue(structProps.ContainsKey("NullableDateTime"));
-        Assert.IsTrue(structProps.ContainsKey("Object"));
-        Assert.AreEqual(20, structProps["Integer"].LiteralValue());
-        Assert.AreEqual(15, structProps["NullableInteger"].LiteralValue());
-        Assert.AreEqual(dateTime, structProps["DateTime"].LiteralValue());
-        Assert.AreEqual(dateTime, structProps["NullableDateTime"].LiteralValue());
-        Assert.AreEqual("Bar", structProps["Object"].LiteralValue());
-
-        var partiallyItitializedProps = ((StructureValue)props["StructPartiallyInitialized"]).Properties
-            .ToDictionary(p => p.Name, p => p.Value);
-
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("Integer"));
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("NullableInteger"));
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("DateTime"));
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("NullableDateTime"));
-        Assert.IsFalse(partiallyItitializedProps.ContainsKey("Object"));
-        Assert.AreEqual(20, partiallyItitializedProps["Integer"].LiteralValue());
-        Assert.AreEqual(15, partiallyItitializedProps["NullableInteger"].LiteralValue());
-        Assert.AreEqual(dateTime, partiallyItitializedProps["DateTime"].LiteralValue());
-        Assert.AreEqual(dateTime, partiallyItitializedProps["NullableDateTime"].LiteralValue());
+        props.ContainsKey("String").ShouldBeTrue();
+        props.ContainsKey("Integer").ShouldBeTrue();
+        props.ContainsKey("NullableInteger").ShouldBeTrue();
+        props.ContainsKey("Object").ShouldBeTrue();
+        props.ContainsKey("IntegerAsObject").ShouldBeTrue();
+        props.ContainsKey("DateTime").ShouldBeTrue();
+        props.ContainsKey("NullableDateTime").ShouldBeTrue();
+        props.ContainsKey("Struct").ShouldBeTrue();
+        props.ContainsKey("NullableStruct").ShouldBeTrue();
+        props.ContainsKey("StructPartiallyInitialized").ShouldBeTrue();
+
+        props["String"].LiteralValue().ShouldBe("Foo");
+        props["Integer"].LiteralValue().ShouldBe(10);
+        props["NullableInteger"].LiteralValue().ShouldBe(5);
+        props["Object"].LiteralValue().ShouldBe("Bar");
+        props["IntegerAsObject"].LiteralValue().ShouldBe(0);
+        props["DateTime"].LiteralValue().ShouldBe(dateTime);
+        props["NullableDateTime"].LiteralValue().ShouldBe(dateTime);
+        props["Struct"].ShouldBeOfType<StructureValue>();
+        props["NullableStruct"].ShouldBeOfType<StructureValue>();
+        props["StructPartiallyInitialized"].ShouldBeOfType<StructureValue>();
+
+        var structProps = ((StructureValue)props["Struct"]).Properties.ToDictionary(p => p.Name, p => p.Value);
+
+        structProps.ContainsKey("Integer").ShouldBeTrue();
+        structProps.ContainsKey("NullableInteger").ShouldBeTrue();
+        structProps.ContainsKey("DateTime").ShouldBeTrue();
+        structProps.ContainsKey("NullableDateTime").ShouldBeTrue();
+        structProps.ContainsKey("Object").ShouldBeTrue();
+        structProps["Integer"].LiteralValue().ShouldBe(20);
+        structProps["NullableInteger"].LiteralValue().ShouldBe(15);
+        structProps["DateTime"].LiteralValue().ShouldBe(dateTime);
+        structProps["NullableDateTime"].LiteralValue().ShouldBe(dateTime);
+        structProps["Object"].LiteralValue().ShouldBe("Bar");
+
+        var partiallyItitializedProps = ((StructureValue)props["StructPartiallyInitialized"]).Properties.ToDictionary(p => p.Name, p => p.Value);
+
+        partiallyItitializedProps.ContainsKey("Integer").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("NullableInteger").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("DateTime").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("NullableDateTime").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("Object").ShouldBeFalse();
+        partiallyItitializedProps["Integer"].LiteralValue().ShouldBe(20);
+        partiallyItitializedProps["NullableInteger"].LiteralValue().ShouldBe(15);
+        partiallyItitializedProps["DateTime"].LiteralValue().ShouldBe(dateTime);
+        partiallyItitializedProps["NullableDateTime"].LiteralValue().ShouldBe(dateTime);
     }
 
     [Test]
@@ -290,8 +289,8 @@ public void WithMask_NotLoggedIfNull_Uninitialized()
         var sv = (StructureValue)evt!.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsFalse(props.ContainsKey("String"));
-        Assert.IsFalse(props.ContainsKey("Object"));
+        props.ContainsKey("String").ShouldBeFalse();
+        props.ContainsKey("Object").ShouldBeFalse();
     }
 
     [Test]
@@ -316,11 +315,11 @@ public void WithMask_NotLoggedIfNull_Initialized()
         var sv = (StructureValue)evt!.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsTrue(props.ContainsKey("String"));
-        Assert.IsTrue(props.ContainsKey("Object"));
+        props.ContainsKey("String").ShouldBeTrue();
+        props.ContainsKey("Object").ShouldBeTrue();
 
-        Assert.AreEqual("Foo***", props["String"].LiteralValue());
-        Assert.AreEqual("Bar***", props["Object"].LiteralValue());
+        props["String"].LiteralValue().ShouldBe("Foo***");
+        props["Object"].LiteralValue().ShouldBe("Bar***");
     }
 
     [Test]
@@ -345,7 +344,7 @@ public void EnumerableIgnored()
         log.Information("Here is {@Customized}", customized);
 
         var sv = evt!.Properties["Customized"];
-        Assert.IsInstanceOf<SequenceValue>(sv);
+        sv.ShouldBeOfType<SequenceValue>();
     }
 
     [Test]
@@ -373,15 +372,14 @@ public void EnumerableDestructedAsStruct()
         var sv = (StructureValue)evt!.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsTrue(props.ContainsKey("Integer"));
-        Assert.IsFalse(props.ContainsKey("NullableInteger"));
-        Assert.IsTrue(props.ContainsKey("Dependency"));
+        props.ContainsKey("Integer").ShouldBeTrue();
+        props.ContainsKey("NullableInteger").ShouldBeFalse();
+        props.ContainsKey("Dependency").ShouldBeTrue();
 
-        var dependencyProps = ((StructureValue)props["Dependency"]).Properties
-            .ToDictionary(p => p.Name, p => p.Value);
+        var dependencyProps = ((StructureValue)props["Dependency"]).Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsTrue(dependencyProps.ContainsKey("Integer"));
-        Assert.IsFalse(dependencyProps.ContainsKey("NullableInteger"));
+        dependencyProps.ContainsKey("Integer").ShouldBeTrue();
+        dependencyProps.ContainsKey("NullableInteger").ShouldBeFalse();
     }
 
     [Test]
@@ -401,17 +399,17 @@ public void NotLoggedIfNullAttribute_Uninitialized()
         var sv = (StructureValue)evt!.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsTrue(props.ContainsKey("Integer"));
-        Assert.IsTrue(props.ContainsKey("DateTime"));
-        Assert.IsTrue(props.ContainsKey("Struct"));
-        Assert.IsTrue(props.ContainsKey("StructPartiallyInitialized"));
-
-        Assert.IsFalse(props.ContainsKey("String"));
-        Assert.IsFalse(props.ContainsKey("NullableInteger"));
-        Assert.IsFalse(props.ContainsKey("IntegerAsObject"));
-        Assert.IsFalse(props.ContainsKey("Object"));
-        Assert.IsFalse(props.ContainsKey("NullableDateTime"));
-        Assert.IsFalse(props.ContainsKey("NullableStruct"));
+        props.ContainsKey("Integer").ShouldBeTrue();
+        props.ContainsKey("DateTime").ShouldBeTrue();
+        props.ContainsKey("Struct").ShouldBeTrue();
+        props.ContainsKey("StructPartiallyInitialized").ShouldBeTrue();
+
+        props.ContainsKey("String").ShouldBeFalse();
+        props.ContainsKey("NullableInteger").ShouldBeFalse();
+        props.ContainsKey("IntegerAsObject").ShouldBeFalse();
+        props.ContainsKey("Object").ShouldBeFalse();
+        props.ContainsKey("NullableDateTime").ShouldBeFalse();
+        props.ContainsKey("NullableStruct").ShouldBeFalse();
     }
 
     [Test]
@@ -462,57 +460,53 @@ public void NotLoggedIfNullAttribute_Initialized()
         var sv = (StructureValue)evt!.Properties["Customized"];
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
-        Assert.IsTrue(props.ContainsKey("String"));
-        Assert.IsTrue(props.ContainsKey("Integer"));
-        Assert.IsTrue(props.ContainsKey("NullableInteger"));
-        Assert.IsTrue(props.ContainsKey("Object"));
-        Assert.IsTrue(props.ContainsKey("IntegerAsObject"));
-        Assert.IsTrue(props.ContainsKey("DateTime"));
-        Assert.IsTrue(props.ContainsKey("NullableDateTime"));
-        Assert.IsTrue(props.ContainsKey("Struct"));
-        Assert.IsTrue(props.ContainsKey("NullableStruct"));
-        Assert.IsTrue(props.ContainsKey("StructPartiallyInitialized"));
-
-        Assert.AreEqual("Foo", props["String"].LiteralValue());
-        Assert.AreEqual(10, props["Integer"].LiteralValue());
-        Assert.AreEqual(5, props["NullableInteger"].LiteralValue());
-        Assert.AreEqual("Bar", props["Object"].LiteralValue());
-        Assert.AreEqual(0, props["IntegerAsObject"].LiteralValue());
-        Assert.AreEqual(dateTime, props["DateTime"].LiteralValue());
-        Assert.AreEqual(dateTime, props["NullableDateTime"].LiteralValue());
-        Assert.IsInstanceOf<StructureValue>(props["Struct"]);
-        Assert.IsInstanceOf<StructureValue>(props["NullableStruct"]);
-        Assert.IsInstanceOf<StructureValue>(props["StructPartiallyInitialized"]);
-
-        var structProps = ((StructureValue)props["Struct"]).Properties
-            .ToDictionary(p => p.Name, p => p.Value);
-
-        Assert.IsTrue(structProps.ContainsKey("Integer"));
-        Assert.IsTrue(structProps.ContainsKey("NullableInteger"));
-        Assert.IsTrue(structProps.ContainsKey("DateTime"));
-        Assert.IsTrue(structProps.ContainsKey("NullableDateTime"));
-        Assert.IsTrue(structProps.ContainsKey("Object"));
-        Assert.AreEqual(20, structProps["Integer"].LiteralValue());
-        Assert.AreEqual(15, structProps["NullableInteger"].LiteralValue());
-        Assert.AreEqual(dateTime, structProps["DateTime"].LiteralValue());
-        Assert.AreEqual(dateTime, structProps["NullableDateTime"].LiteralValue());
-        Assert.AreEqual("Bar", structProps["Object"].LiteralValue());
-
-        var partiallyItitializedProps = ((StructureValue)props["StructPartiallyInitialized"]).Properties
-            .ToDictionary(p => p.Name, p => p.Value);
-
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("Integer"));
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("NullableInteger"));
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("DateTime"));
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("NullableDateTime"));
-        Assert.IsTrue(partiallyItitializedProps.ContainsKey("Object"));
-        Assert.AreEqual(20, partiallyItitializedProps["Integer"].LiteralValue());
-        Assert.AreEqual(15, partiallyItitializedProps["NullableInteger"].LiteralValue());
-        Assert.AreEqual(dateTime, partiallyItitializedProps["DateTime"].LiteralValue());
-        Assert.AreEqual(dateTime, partiallyItitializedProps["NullableDateTime"].LiteralValue());
-
+        props.ContainsKey("String").ShouldBeTrue();
+        props.ContainsKey("Integer").ShouldBeTrue();
+        props.ContainsKey("NullableInteger").ShouldBeTrue();
+        props.ContainsKey("Object").ShouldBeTrue();
+        props.ContainsKey("IntegerAsObject").ShouldBeTrue();
+        props.ContainsKey("DateTime").ShouldBeTrue();
+        props.ContainsKey("NullableDateTime").ShouldBeTrue();
+        props.ContainsKey("Struct").ShouldBeTrue();
+        props.ContainsKey("NullableStruct").ShouldBeTrue();
+        props.ContainsKey("StructPartiallyInitialized").ShouldBeTrue();
+
+        props["String"].LiteralValue().ShouldBe("Foo");
+        props["Integer"].LiteralValue().ShouldBe(10);
+        props["NullableInteger"].LiteralValue().ShouldBe(5);
+        props["Object"].LiteralValue().ShouldBe("Bar");
+        props["IntegerAsObject"].LiteralValue().ShouldBe(0);
+        props["DateTime"].LiteralValue().ShouldBe(dateTime);
+        props["NullableDateTime"].LiteralValue().ShouldBe(dateTime);
+        props["Struct"].ShouldBeOfType<StructureValue>();
+        props["NullableStruct"].ShouldBeOfType<StructureValue>();
+        props["StructPartiallyInitialized"].ShouldBeOfType<StructureValue>();
+
+        var structProps = ((StructureValue)props["Struct"]).Properties.ToDictionary(p => p.Name, p => p.Value);
+
+        structProps.ContainsKey("Integer").ShouldBeTrue();
+        structProps.ContainsKey("NullableInteger").ShouldBeTrue();
+        structProps.ContainsKey("DateTime").ShouldBeTrue();
+        structProps.ContainsKey("NullableDateTime").ShouldBeTrue();
+        structProps.ContainsKey("Object").ShouldBeTrue();
+        structProps["Integer"].LiteralValue().ShouldBe(20);
+        structProps["NullableInteger"].LiteralValue().ShouldBe(15);
+        structProps["DateTime"].LiteralValue().ShouldBe(dateTime);
+        structProps["NullableDateTime"].LiteralValue().ShouldBe(dateTime);
+        structProps["Object"].LiteralValue().ShouldBe("Bar");
+
+        var partiallyItitializedProps = ((StructureValue)props["StructPartiallyInitialized"]).Properties.ToDictionary(p => p.Name, p => p.Value);
+
+        partiallyItitializedProps.ContainsKey("Integer").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("NullableInteger").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("DateTime").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("NullableDateTime").ShouldBeTrue();
+        partiallyItitializedProps.ContainsKey("Object").ShouldBeTrue();
+        partiallyItitializedProps["Integer"].LiteralValue().ShouldBe(20);
+        partiallyItitializedProps["NullableInteger"].LiteralValue().ShouldBe(15);
+        partiallyItitializedProps["DateTime"].LiteralValue().ShouldBe(dateTime);
+        partiallyItitializedProps["NullableDateTime"].LiteralValue().ShouldBe(dateTime);
     }
-
 }
 
 
diff --git a/src/Destructurama.Attributed.Tests/LogWithNameAttributedTests.cs b/src/Destructurama.Attributed.Tests/LogWithNameAttributedTests.cs
@@ -2,13 +2,13 @@
 using NUnit.Framework;
 using Serilog;
 using Serilog.Events;
+using Shouldly;
 
 namespace Destructurama.Attributed.Tests;
 
 [TestFixture]
 public class LogWithNameAttributedTests
 {
-
     [Test]
     public void AttributesAreConsultedWhenDestructuring()
     {
@@ -30,7 +30,7 @@ public void AttributesAreConsultedWhenDestructuring()
         var props = sv.Properties.ToDictionary(p => p.Name, p => p.Value);
 
         var literalValue = props["FullName"].LiteralValue();
-        Assert.AreEqual("John Doe", literalValue);
+        literalValue.ShouldBe("John Doe");
     }
 
     #region LogWithName