Fix issue while deserializing null values (#1640)

microsoft · Jun 14, 2018 · eefdea2 · eefdea2
1 parent a787752
commit eefdea2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomKeyValueConverter.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomKeyValueConverter.cs
@@ -45,13 +45,13 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 {
                     // Converting Json data to array of KeyValuePairs with duplicate keys.
                     var serializer = new System.Runtime.Serialization.Json.DataContractJsonSerializer(typeof(TraitObject[]));
-                    var listOfTraitObjects = serializer.ReadObject(stream) as TraitObject[];                                        
+                    var listOfTraitObjects = serializer.ReadObject(stream) as TraitObject[];
 
-                    return listOfTraitObjects.Select(i => new KeyValuePair<string, string>(i.Key, i.Value)).ToArray();;
+                    return listOfTraitObjects.Select(i => new KeyValuePair<string, string>(i.Key, i.Value)).ToArray();
                 }
             }
 
-            return base.ConvertFrom(context, culture, value);
+            return null;
         }
 
         [System.Runtime.Serialization.DataContract]

diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomStringArrayConverter.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomStringArrayConverter.cs
@@ -45,7 +45,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 }
             }
 
-            return base.ConvertFrom(context, culture, value);
+            return null;
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs
@@ -85,5 +85,13 @@ public void CustomKeyValueConverterShouldDeserializeDuplicateKeysKvps()
             Assert.AreEqual("key1", data[1].Key);
             Assert.AreEqual("val2", data[1].Value);
         }
+
+        [TestMethod]
+        public void CustomKeyValueConverterShouldDeserializeNullValue()
+        {
+            var data = this.customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, null) as KeyValuePair<string, string>[];
+
+            Assert.AreEqual(null, data);
+        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs
@@ -67,5 +67,14 @@ public void CustomStringArrayConverterShouldDeserializeEmptyKeyOrValue()
             Assert.AreEqual(string.Empty, data[0]);
             Assert.AreEqual(string.Empty, data[1]);
         }
+
+
+        [TestMethod]
+        public void CustomStringArrayConverterShouldDeserializeNullValue()
+        {
+            var data = this.customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, null) as string[];
+
+            Assert.AreEqual(null, data);
+        }
     }
 }