More CSV tests

Author: mythz

src/ServiceStack.Text/CsvSerializer.cs

@@ -154,6 +154,11 @@ public static object DeserializeFromStream(Type type, Stream stream)
             }
         }
 
+        public static T DeserializeFromReader<T>(TextReader reader)
+        {
+            return DeserializeFromString<T>(reader.ReadToEnd());
+        }
+
         public static T DeserializeFromString<T>(string text)
         {
             if (string.IsNullOrEmpty(text)) return default(T);

tests/ServiceStack.Text.Tests/CsvSerializerTests.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using Northwind.Common.DataModel;
 using NUnit.Framework;
 using ServiceStack.Text.Tests.Support;
@@ -33,13 +34,31 @@ public void Serialize<T>(T data)
             csv.Print();
         }
 
-        public void SerializeAndDeserialize<T>(T data)
+        public object SerializeAndDeserialize<T>(T data)
         {
             var csv = CsvSerializer.SerializeToString(data);
             csv.Print();
 
             var dto = CsvSerializer.DeserializeFromString<T>(csv);
+            AssertEqual(dto, data);
 
+            using (var reader = new StringReader(csv))
+            {
+                dto = CsvSerializer.DeserializeFromReader<T>(reader);
+                AssertEqual(dto, data);
+            }
+
+            using (var ms = new MemoryStream(csv.ToUtf8Bytes()))
+            {
+                dto = CsvSerializer.DeserializeFromStream<T>(ms);
+                AssertEqual(dto, data);
+            }
+
+            return dto;
+        }
+
+        private static void AssertEqual<T>(T dto, T data)
+        {
             var dataArray = data is IEnumerable ? (data as IEnumerable).Map(x => x).ToArray() : null;
             var dtoArray = dto is IEnumerable ? (dto as IEnumerable).Map(x => x).ToArray() : null;
 
@@ -102,6 +121,13 @@ public void Can_Serialize_inherited_Movies()
             SerializeAndDeserialize(new Movies(MoviesData.Movies));
         }
 
+        [Test]
+        public void Does_Serialize_back_into_Array()
+        {
+            var dto = SerializeAndDeserialize(MoviesData.Movies.ToArray());
+            Assert.That(dto.GetType().IsArray);
+        }
+
         [Test]
         public void Can_Serialize_MovieResponse_Dto()
         {