Merge pull request #361 from WimAtIHomer/master

Added XmlElement test and possible fixes to fix test

Author: mythz

src/ServiceStack.Text/Common/DeserializeSpecializedCollections.cs

@@ -52,7 +52,7 @@ public static ParseStringDelegate GetParseFn()
                 return ParseStringCollection<TSerializer>;
             }
 #endif
-            if (typeof(T) == typeof(IEnumerable))
+            if (typeof (T) == typeof (IEnumerable) || typeof(T) == typeof(ICollection))
             {
                 return GetEnumerableParseFn();
             }
@@ -139,6 +139,7 @@ public static ParseStringDelegate GetEnumerableParseFn()
         public static ParseStringDelegate GetGenericEnumerableParseFn()
         {
             var enumerableInterface = typeof(T).GetTypeWithGenericInterfaceOf(typeof(IEnumerable<>));
+            if (enumerableInterface == null) return null; 
             var elementType = enumerableInterface.GenericTypeArguments()[0];
             var genericType = typeof(SpecializedEnumerableElements<,>).MakeGenericType(typeof(T), elementType);
             var fi = genericType.GetPublicStaticField("ConvertFn");
@@ -213,4 +214,4 @@ public static object ConvertFromCollection(object enumerable)
             return to;
         }
     }
-}
+}

src/ServiceStack.Text/Common/JsReader.cs

@@ -85,7 +85,7 @@ private ParseStringDelegate GetCoreParseFn<T>()
             }
 #endif
 
-            var isDictionary = typeof(T) != typeof(IEnumerable)
+            var isDictionary = typeof(T) != typeof(IEnumerable) && typeof(T) != typeof(ICollection)
                 && (typeof(T).AssignableFrom(typeof(IDictionary)) || typeof(T).HasInterface(typeof(IDictionary)));
             if (isDictionary)
             {
@@ -124,4 +124,4 @@ private ParseStringDelegate GetCoreParseFn<T>()
         }
 
     }
-}
+}

src/ServiceStack.Text/Common/JsWriter.cs

@@ -413,7 +413,7 @@ private WriteObjectDelegate GetCoreWriteFn<T>()
                 }
             }
 
-            var isDictionary = typeof(T) != typeof(IEnumerable) 
+            var isDictionary = typeof(T) != typeof(IEnumerable) && typeof(T) != typeof(ICollection)
                 && (typeof(T).AssignableFrom(typeof(IDictionary)) || typeof(T).HasInterface(typeof(IDictionary)));
             if (isDictionary)
             {
@@ -462,4 +462,4 @@ public void WriteType(TextWriter writer, object value)
         }
 
     }
-}
+}

tests/ServiceStack.Text.Tests/AdhocModelTests.cs

@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.Runtime.Serialization;
 using System.Threading;
+using System.Xml;
 using NUnit.Framework;
 using ServiceStack.Common.Extensions;
 using ServiceStack.Text.Jsv;
@@ -710,7 +711,39 @@ public void Can_serialize_IEnumerable()
             };
 
             var from = Serialize(dto, includeXml: false);
+            Assert.IsNotNull(from.Blah);
             from.PrintDump();
         }
+
+        public class BreakerCollection
+        {
+            public ICollection Blah { get; set; }
+        }
+
+        [Test]
+        public void Can_serialize_ICollection()
+        {
+            var dto = new BreakerCollection
+            {
+                Blah = new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9 }
+            };
+            
+            var from = Serialize(dto, includeXml: false);
+            Assert.IsNotNull(from.Blah);
+            Assert.AreEqual(dto.Blah.Count, from.Blah.Count);
+            from.PrintDump();
+        }
+
+        public class XmlAny
+        {
+            public XmlElement[] Any { get; set; }
+        }
+
+        [Test]
+        public void Can_serialize_Specialized_IEnumerable()
+        {
+            var getParseFn = JsvReader.GetParseFn(typeof (XmlAny));
+            Assert.IsNotNull(getParseFn);
+        }
     }
 }