Add nested populate test

Author: mythz

src/ServiceStack.Text/AutoMappingUtils.cs

@@ -123,9 +123,6 @@ public static object ConvertTo(this object from, Type toType, bool skipConverter
                 return null;
 
             var fromType = from.GetType();
-            if (fromType == toType || toType == typeof(object))
-                return from;
-
             if (ShouldIgnoreMapping(fromType, toType))
                 return null;
 
@@ -136,6 +133,9 @@ public static object ConvertTo(this object from, Type toType, bool skipConverter
                     return converter(from);
             }
 
+            if (fromType == toType || toType == typeof(object))
+                return from;
+
             if (fromType.IsValueType || toType.IsValueType)
                 return ChangeValueType(from, toType);
 

tests/ServiceStack.Text.Tests/AutoMappingTests.cs

@@ -1421,6 +1421,60 @@ private static void AssertAreEqual(TestClassA testA, TestClassB testB)
             Assert.That(testA.ListEnums,
                 Is.EquivalentTo(testB.ListEnums.ConvertAll(x => x.ToEnum<TestEnum>())));
         }
-        
+
+        class Company
+        {
+            public string Name { get; set; }
+            public Address Address { get; set; }
+        }
+
+        class Address
+        {
+            public string City { get; set; }
+            public string PostCode { get; set; }
+        }
+
+        [Test]
+        public void Can_register_converters_to_PopulateWithNonDefaultValues()
+        {
+            Company Create()
+            {
+                return new Company {
+                    Name = "Compnay1",
+                    Address = new Address {
+                        City = "NY",
+                        PostCode = "1234",
+                    }
+                };
+            }
+
+            var defaults = Create();
+            var original = Create();
+
+            original.PopulateWithNonDefaultValues(new Company {
+                Address = new Address {
+                    PostCode = "4321"
+                }
+            });
+            
+            Assert.That(original.Name, Is.EqualTo(defaults.Name));
+            Assert.That(original.Address.City, Is.Null);
+            Assert.That(original.Address.PostCode, Is.EqualTo("4321"));
+            
+            original = Create();
+
+            var updated = new Company {
+                Address = new Address {
+                    PostCode = "4321"
+                }
+            };
+            original.Address.PopulateWithNonDefaultValues(updated.Address);
+            updated.Address = null;
+            original.PopulateWithNonDefaultValues(updated);
+            
+            Assert.That(original.Name, Is.EqualTo(defaults.Name));
+            Assert.That(original.Address.City, Is.EqualTo(defaults.Address.City));
+            Assert.That(original.Address.PostCode, Is.EqualTo("4321"));
+        }
     }
 }