Add tests for KeyValuePair<>/Dictionary ArgumentFormatter update

bradwilson · bradwilson · commit 32d21fbef182 · 2022-07-05T20:33:41.000-07:00
diff --git a/src/xunit.assert/Asserts b/src/xunit.assert/Asserts
@@ -1 +1 @@
-Subproject commit 43e3e208a597bc1a4c77f2665f39f98e7401c157
+Subproject commit 098b7f571546b27ffa03c6a2c901efd9fe75ad5c
diff --git a/test/test.xunit.assert/Asserts/EquivalenceAssertsTests.cs b/test/test.xunit.assert/Asserts/EquivalenceAssertsTests.cs
@@ -921,8 +921,8 @@ public void Failure()
 			Assert.IsType<EquivalentException>(ex);
 			Assert.Equal(
 				"Assert.Equivalent() Failure: Collection value not found" + Environment.NewLine +
-				"Expected: [Foo, 16]" + Environment.NewLine +
-				"In:       [[Foo, 42], [Bar, 2112]]",
+				"Expected: [\"Foo\"] = 16" + Environment.NewLine +
+				"In:       [[\"Foo\"] = 42, [\"Bar\"] = 2112]",
 				ex.Message
 			);
 		}
@@ -938,8 +938,8 @@ public void Failure_EmbeddedDictionary()
 			Assert.IsType<EquivalentException>(ex);
 			Assert.Equal(
 				"Assert.Equivalent() Failure: Collection value not found in member 'x'" + Environment.NewLine +
-				"Expected: [Foo, 16]" + Environment.NewLine +
-				"In:       [[Foo, 42], [Bar, 2112]]",
+				"Expected: [\"Foo\"] = 16" + Environment.NewLine +
+				"In:       [[\"Foo\"] = 42, [\"Bar\"] = 2112]",
 				ex.Message
 			);
 		}
@@ -976,8 +976,8 @@ public void Failure_ValueNotFoundInActual()
 			Assert.IsType<EquivalentException>(ex);
 			Assert.Equal(
 				"Assert.Equivalent() Failure: Collection value not found" + Environment.NewLine +
-				"Expected: [Foo, 16]" + Environment.NewLine +
-				"In:       [[Foo, 42], [Bar, 2112]]",
+				"Expected: [\"Foo\"] = 16" + Environment.NewLine +
+				"In:       [[\"Foo\"] = 42, [\"Bar\"] = 2112]",
 				ex.Message
 			);
 		}
@@ -993,8 +993,8 @@ public void Failure_ExtraValueInActual()
 			Assert.IsType<EquivalentException>(ex);
 			Assert.Equal(
 				"Assert.Equivalent() Failure: Extra values found" + Environment.NewLine +
-				"Expected: [[Bar, 2112], [Foo, 42]]" + Environment.NewLine +
-				"Actual:   [[Biff, 2600]] left over from [[Foo, 42], [Biff, 2600], [Bar, 2112]]",
+				"Expected: [[\"Bar\"] = 2112, [\"Foo\"] = 42]" + Environment.NewLine +
+				"Actual:   [[\"Biff\"] = 2600] left over from [[\"Foo\"] = 42, [\"Biff\"] = 2600, [\"Bar\"] = 2112]",
 				ex.Message
 			);
 		}
@@ -1010,8 +1010,8 @@ public void Failure_EmbeddedDictionary_ValueNotFoundInActual()
 			Assert.IsType<EquivalentException>(ex);
 			Assert.Equal(
 				"Assert.Equivalent() Failure: Collection value not found in member 'x'" + Environment.NewLine +
-				"Expected: [Foo, 16]" + Environment.NewLine +
-				"In:       [[Foo, 42], [Bar, 2112]]",
+				"Expected: [\"Foo\"] = 16" + Environment.NewLine +
+				"In:       [[\"Foo\"] = 42, [\"Bar\"] = 2112]",
 				ex.Message
 			);
 		}
@@ -1027,8 +1027,8 @@ public void Failure_EmbeddedDictionary_ExtraValueInActual()
 			Assert.IsType<EquivalentException>(ex);
 			Assert.Equal(
 				"Assert.Equivalent() Failure: Extra values found in member 'x'" + Environment.NewLine +
-				"Expected: [[Bar, 2112], [Foo, 42]]" + Environment.NewLine +
-				"Actual:   [[Biff, 2600]] left over from [[Foo, 42], [Biff, 2600], [Bar, 2112]]",
+				"Expected: [[\"Bar\"] = 2112, [\"Foo\"] = 42]" + Environment.NewLine +
+				"Actual:   [[\"Biff\"] = 2600] left over from [[\"Foo\"] = 42, [\"Biff\"] = 2600, [\"Bar\"] = 2112]",
 				ex.Message
 			);
 		}
diff --git a/test/test.xunit.assert/Asserts/Sdk/ArgumentFormatterTests.cs b/test/test.xunit.assert/Asserts/Sdk/ArgumentFormatterTests.cs
@@ -237,6 +237,18 @@ public static void Flags(FlagsEnum enumValue, string expected)
 		}
 	}
 
+	public class KeyValuePair
+	{
+		[CulturedFact]
+		public static void KeyValuePairValue()
+		{
+			var kvp = new KeyValuePair<object, List<object>>(42, new() { 21.12M, "2600" });
+			var expected = $"[42] = [{21.12M}, \"2600\"]";
+
+			Assert.Equal(expected, ArgumentFormatter.Format(kvp));
+		}
+	}
+
 	public class Enumerables
 	{
 		[CulturedFact]
@@ -247,6 +259,19 @@ public static void EnumerableValue()
 			Assert.Equal(expected, ArgumentFormatter.Format(new object[] { 1, 2.3M, "Hello, world!" }));
 		}
 
+		[CulturedFact]
+		public static void DictionaryValue()
+		{
+			var value = new Dictionary<object, List<object>>
+			{
+				{ 42, new() { 21.12M, "2600" } },
+				{ "123", new() { } },
+			};
+			var expected = $"[[42] = [{21.12M}, \"2600\"], [\"123\"] = []]";
+
+			Assert.Equal(expected, ArgumentFormatter.Format(value));
+		}
+
 		[CulturedFact]
 		public static void OnlyFirstFewValuesOfEnumerableAreRendered()
 		{
