Merge branch 'azabluda-bug-MergeChanges-inherited' into develop

TrackableEntities · Apr 20, 2015 · 49f2cb5 · 49f2cb5
2 parents e9c26a0 + 7669bcf
commit 49f2cb5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/Source/Tests/TrackableEntities.Client.Tests.Entities/NorthwindModels/PriorityOrder.cs b/Source/Tests/TrackableEntities.Client.Tests.Entities/NorthwindModels/PriorityOrder.cs
@@ -0,0 +1,21 @@
+using System;
+using Newtonsoft.Json;
+
+namespace TrackableEntities.Client.Tests.Entities.NorthwindModels
+{
+    [JsonObject(IsReference = true)]
+    public class PriorityOrder : Order
+    {
+        private string _priorityPlan;
+        public string PriorityPlan
+        {
+            get { return _priorityPlan; }
+            set
+            {
+                if (value == _priorityPlan) return;
+                _priorityPlan = value;
+                NotifyPropertyChanged(() => PriorityPlan);
+            }
+        }
+    }
+}
diff --git a/...ts/TrackableEntities.Client.Tests.Entities/TrackableEntities.Client.Tests.Entities.csproj b/...ts/TrackableEntities.Client.Tests.Entities/TrackableEntities.Client.Tests.Entities.csproj
@@ -53,6 +53,7 @@
     <Compile Include="Mocks\MockNorthwind.cs" />
     <Compile Include="NorthwindModels\Area.cs" />
     <Compile Include="NorthwindModels\CustomerSetting.cs" />
+    <Compile Include="NorthwindModels\PriorityOrder.cs" />
     <Compile Include="NorthwindModels\PromotionalProduct.cs" />
     <Compile Include="NorthwindModels\Territory.cs" />
     <Compile Include="NorthwindModels\Employee.cs" />

diff --git a/Source/Tests/TrackableEntities.Client.Tests.Extensions/ChangeTrackingExtensionsTests.cs b/Source/Tests/TrackableEntities.Client.Tests.Extensions/ChangeTrackingExtensionsTests.cs
@@ -122,8 +122,9 @@ public void MergeChanges_Should_Set_TrackingState_To_Unchanged_For_Added_Order_W
         {
             // Arrange
             var database = new MockNorthwind();
-            var origOrder = new Order
+            var origOrder = new PriorityOrder
             {
+                PriorityPlan = "Silver",
                 OrderDate = DateTime.Parse("1996-07-04"),
                 CustomerId = "ALFKI"
             };

diff --git a/Source/TrackableEntities.Client/ChangeTrackingExtensions.cs b/Source/TrackableEntities.Client/ChangeTrackingExtensions.cs
@@ -221,7 +221,7 @@ private static void SetEntityProperties(this ITrackable targetItem, ITrackable s
 #if SILVERLIGHT || NET40
             foreach (var prop in targetItem.GetType().GetProperties().Where(p => p.CanWrite)
 #else
-            foreach (var prop in targetItem.GetType().GetTypeInfo().DeclaredProperties
+            foreach (var prop in targetItem.GetType().BaseTypes().SelectMany(t => t.GetTypeInfo().DeclaredProperties)
                 .Where(p => p.CanWrite && !p.GetMethod.IsPrivate)
 #endif
                 .Except(targetItem.GetNavigationProperties(false).Select(np => np.Property)))