1.2.1 - Support KeyValuePair<,> object type

Author: anisite

src/MDAT/MDAT.csproj

@@ -10,7 +10,7 @@
 		<Company>MESS</Company>
 		<PackageProjectUrl>https://github.com/MTESSDev/mdAT</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/MTESSDev/mdAT</RepositoryUrl>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Description>Markdown Auto-Tests for .net 6+, based on MSTestsV2 DataSource.</Description>
   </PropertyGroup>
 

src/MDAT/MarkdownTest.cs

@@ -212,6 +212,7 @@ private static IDeserializer NewDeserializer(INodeTypeResolver resolver, string
             DeserializerBuilder deserializer = new DeserializerBuilder()
               .WithTypeConverter(new ByteArayConverter(), e => e.OnBottom())
               .WithNodeTypeResolver(resolver)
+              .WithNodeDeserializer(new KeyValuePairNodeDeserializer())
               .IgnoreUnmatchedProperties()
               .WithAttemptingUnquotedStringTypeDeserialization()
               .WithTagMapping(MdatConstants.IncludeTag, typeof(IncludeRef));

src/MDAT/Resolver/KeyValuePairNodeDeserializer.cs

@@ -0,0 +1,40 @@
+using YamlDotNet.Core.Events;
+using YamlDotNet.Core;
+using YamlDotNet.Serialization;
+
+namespace MDAT.Resolver
+{
+    internal class KeyValuePairNodeDeserializer : INodeDeserializer
+    {
+        public bool Deserialize(IParser parser, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)
+        {
+            if (expectedType.IsGenericType && expectedType.GetGenericTypeDefinition() == typeof(KeyValuePair<,>))
+            {
+                parser.Consume<MappingStart>();
+
+                var pairArgs = expectedType.GetGenericArguments();
+
+                object? key = null;
+                object? val = null;
+
+                if (parser.Accept<Scalar>(out var skey)
+                    && skey.Value.ToLower().Equals("key")
+                    && parser.Consume<Scalar>() is { })
+                    key = nestedObjectDeserializer(parser, pairArgs[0]);
+
+                if (parser.Accept<Scalar>(out var svalue)
+                    && svalue.Value.ToLower().Equals("value")
+                    && parser.Consume<Scalar>() is { })
+                    val = nestedObjectDeserializer(parser, pairArgs[1]);
+
+                value = Activator.CreateInstance(expectedType, key, val);
+
+                parser.Consume<MappingEnd>();
+                return true;
+            }
+
+            value = null;
+            return false;
+        }
+    }
+}

src/MDATTests/MarkdownTestAttributeTests.cs

@@ -327,6 +327,18 @@ public async Task TestObjectOrExceptionAsync(
             _ = await Verify.Assert(async () => await new Test().ReturnTestAsync(mock.Object), expected);
         }
 
+        /// <summary>
+        /// Test object deserialization 
+        /// </summary>
+        [TestMethod]
+        [MarkdownTest("~\\Tests\\{method}.md")]
+        public async Task Test_keypairvalues(List<KeyValuePair<string, string>> input, Expected expected)
+        {
+
+            object value = await Verify.Assert(() =>
+                                        Task.FromResult(input), expected);
+        }
+
         /// <summary>
         /// Test class
         /// </summary>

src/MDATTests/Tests/test-keypairvalues.md

@@ -0,0 +1,21 @@
+# Test_keypairvalues
+
+> Test object deserialization 
+
+## Case with keyvaluepair<,>
+
+``````yaml
+input:
+ - key: testK
+   value: testV
+expected:
+  name: null
+  generateExpectedData: null
+  verify: 
+    - type: match
+      jsonPath: $
+      allowAdditionalProperties: false
+      data: 
+        - Key: testK
+          Value: testV
+``````