Include alt csv deserialize methods in tests + convert results from late-bound API as well

Author: mythz

src/ServiceStack.Text/CsvSerializer.cs

@@ -149,8 +149,7 @@ public static object DeserializeFromStream(Type type, Stream stream)
             if (stream == null) return null;
             using (var reader = new StreamReader(stream, UTF8Encoding))
             {
-                var readFn = GetReadFn(type);
-                return readFn(reader.ReadToEnd());
+                return DeserializeFromString(type, reader.ReadToEnd());
             }
         }
 
@@ -163,13 +162,16 @@ public static T DeserializeFromString<T>(string text)
         {
             if (string.IsNullOrEmpty(text)) return default(T);
             var results = CsvSerializer<T>.ReadObject(text);
-            return CsvSerializer<T>.ConvertFrom(results);
+            return ConvertFrom<T>(results);
         }
 
         public static object DeserializeFromString(Type type, string text)
         {
             if (string.IsNullOrEmpty(text)) return null;
-            return GetReadFn(type)(text);
+            var fn = GetReadFn(type);
+            var result = fn(text);
+            var converted = ConvertFrom(type, result);
+            return converted;
         }
 
         public static void WriteLateBoundObject(TextWriter writer, object value)
@@ -185,6 +187,50 @@ public static object ReadLateBoundObject(Type type, string value)
             var readFn = GetReadFn(type);
             return readFn(value);
         }
+
+        internal static T ConvertFrom<T>(object results)
+        {
+            if (typeof(T).IsAssignableFromType(results.GetType()))
+                return (T)results;
+
+            foreach (var ci in typeof(T).GetAllConstructors())
+            {
+                var ciParams = ci.GetParameters();
+                if (ciParams.Length == 1)
+                {
+                    var pi = ciParams.First();
+                    if (pi.ParameterType.IsAssignableFromType(typeof(T)))
+                    {
+                        var to = ci.Invoke(new[] { results });
+                        return (T)to;
+                    }
+                }
+            }
+
+            return results.ConvertTo<T>();
+        }
+
+        internal static object ConvertFrom(Type type, object results)
+        {
+            if (type.IsAssignableFromType(results.GetType()))
+                return results;
+
+            foreach (var ci in type.GetAllConstructors())
+            {
+                var ciParams = ci.GetParameters();
+                if (ciParams.Length == 1)
+                {
+                    var pi = ciParams.First();
+                    if (pi.ParameterType.IsAssignableFromType(type))
+                    {
+                        var to = ci.Invoke(new[] { results });
+                        return to;
+                    }
+                }
+            }
+
+            return results.ConvertTo(type);
+        }
     }
 
     public static class CsvSerializer<T>
@@ -486,39 +532,12 @@ public static object ReadObject(string value)
             {
                 return ReadCacheFn(value);
             }
-            catch (Exception ex)
-            {
-                throw;
-            }
             finally
             {
                 JsState.IsCsv = hold;
             }
         }
 
-        public static T ConvertFrom(object results)
-        {
-            if (typeof(T).IsAssignableFromType(results.GetType()))
-            {
-                return (T)results;
-            }
-
-            foreach (var ci in typeof(T).GetAllConstructors())
-            {
-                var ciParams = ci.GetParameters();
-                if (ciParams.Length == 1)
-                {
-                    var pi = ciParams.First();
-                    if (pi.ParameterType.IsAssignableFromType(typeof(T)))
-                    {
-                        var to = ci.Invoke(new[] { results });
-                        return (T)to;
-                    }
-                }
-            }
-
-            return results.ConvertTo<T>();
-        }
 
     }
 }

tests/ServiceStack.Text.Tests/CsvSerializerTests.cs

@@ -54,6 +54,12 @@ public object SerializeAndDeserialize<T>(T data)
                 AssertEqual(dto, data);
             }
 
+            using (var ms = new MemoryStream(csv.ToUtf8Bytes()))
+            {
+                dto = (T)CsvSerializer.DeserializeFromStream(typeof(T), ms);
+                AssertEqual(dto, data);
+            }
+
             return dto;
         }