fix issue #56

esskar · Aug 27, 2015 · 58de914 · 58de914
1 parent 05c8dfc
commit 58de914
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 2 deletions.
diff --git a/src/Serialize.Linq.Tests/Issues/Issue56.cs b/src/Serialize.Linq.Tests/Issues/Issue56.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Serialize.Linq.Serializers;
+
+namespace Serialize.Linq.Tests.Issues
+{
+    [TestClass]
+    public class Issue56
+    {
+        [TestMethod]
+        public void SerializeContainsWithNullablesAndWithoutNullableKey()
+        {
+            var enterpriseKeys = new List<long?> {1, 2, 3, 4};
+
+            var predicatePart =
+                (Expression<Func<GroupEntityWithoutNullable, bool>>)
+                    (groupType =>
+                        enterpriseKeys.Contains(groupType.GroupEnterpriseKey));
+
+            var serializeTo = new ExpressionSerializer(new XmlSerializer())
+            {
+                AutoAddKnownTypesAsListTypes = true
+            };
+            var predicatePartSerializedToString = serializeTo.SerializeText(predicatePart);
+
+            Assert.IsNotNull(predicatePartSerializedToString);
+        }
+
+        [TestMethod]
+        public void SerializeContainsWithNullablesAndWithNullableKey()
+        {
+            var enterpriseKeys = new List<long?> { 1, 2, 3, 4 };
+
+            var predicatePart =
+                (Expression<Func<GroupEntityWithNullable, bool>>)
+                    (groupType =>
+                        enterpriseKeys.Contains(groupType.GroupEnterpriseKey));
+
+            var serializeTo = new ExpressionSerializer(new XmlSerializer())
+            {
+                AutoAddKnownTypesAsListTypes = true
+            };
+            var predicatePartSerializedToString = serializeTo.SerializeText(predicatePart);
+
+            Assert.IsNotNull(predicatePartSerializedToString);
+        }
+
+        class GroupEntityWithoutNullable
+        {
+            public long GroupEnterpriseKey { get; set; }
+        }
+
+        class GroupEntityWithNullable
+        {
+            public long? GroupEnterpriseKey { get; set; }
+        }
+    }
+}
diff --git a/src/Serialize.Linq.Tests/Serialize.Linq.Tests.csproj b/src/Serialize.Linq.Tests/Serialize.Linq.Tests.csproj
@@ -107,6 +107,7 @@
     <Compile Include="Issues\Issue41.cs" />
     <Compile Include="Issues\Issue43.cs" />
     <Compile Include="Issues\Issue50.cs" />
+    <Compile Include="Issues\Issue56.cs" />
     <Compile Include="MemberInfoExtensionsTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/src/Serialize.Linq/Serializers/SerializerBase.cs b/src/Serialize.Linq/Serializers/SerializerBase.cs
@@ -85,8 +85,16 @@ private IEnumerable<Type> ExplodeKnownTypes(IEnumerable<Type> types)
                     yield return type.MakeArrayType();
                 else if (this.AutoAddKnownTypesAsListTypes)
                     yield return typeof(List<>).MakeGenericType(type);
-                if (!type.IsClass)
-                    yield return typeof(Nullable<>).MakeGenericType(type);
+
+                if (type.IsClass) 
+                    continue;
+
+                var nullableType = typeof (Nullable<>).MakeGenericType(type);
+                yield return nullableType;
+                if (this.AutoAddKnownTypesAsArrayTypes)
+                    yield return nullableType.MakeArrayType();
+                else if (this.AutoAddKnownTypesAsListTypes)
+                    yield return typeof(List<>).MakeGenericType(nullableType);
             }
         }
     }