Merge pull request #64 from andypelzer/issue62

Test & Fix for issue #62

Author: Andreas Pelzer

GraphDiff/GraphDiff.Tests/Models/TestModels.cs

@@ -93,6 +93,16 @@ public class InternalKeyModel
     {
         [Key]
         internal int Id { get; set; }
+
+        internal List<InternalKeyAssociate> Associates { get; set; }
+    }
+
+    public class InternalKeyAssociate
+    {
+        [Key]
+        internal int Id { get; set; }
+
+        internal InternalKeyModel Parent { get; set; }
     }
 
     public class NullableKeyModel

GraphDiff/GraphDiff.Tests/TestDbContext.cs

@@ -27,10 +27,6 @@ public class TestDbContext : DbContext
 
 		protected override void OnModelCreating(DbModelBuilder modelBuilder)
 		{
-            // misc
-
-		    modelBuilder.Entity<InternalKeyModel>().HasKey(i => i.Id);
-
             // second tier mappings
 
             modelBuilder.Entity<TestNode>().HasOptional(p => p.OneToOneAssociated).WithOptionalPrincipal(p => p.OneParent);
@@ -57,6 +53,15 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             // Guid mappings
 
             modelBuilder.Entity<GuidTestNode>().HasOptional(p => p.OneToOneOwned).WithRequired(p => p.OneParent);
+
+            // Internal mappings
+
+            modelBuilder.Entity<InternalKeyModel>().HasKey(i => i.Id);
+            modelBuilder.Entity<InternalKeyAssociate>().HasKey(i => i.Id);
+
+            modelBuilder.Entity<InternalKeyModel>()
+                    .HasMany(ikm => ikm.Associates)
+		            .WithRequired(ikm => ikm.Parent);
 		}
 
 		public TestDbContext() : base("GraphDiff") {}

GraphDiff/GraphDiff.Tests/Tests/MiscBehaviours.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using RefactorThis.GraphDiff.Tests.Models;
 
@@ -47,6 +50,45 @@ public void ShouldSupportInternalKeys()
             }
         }
 
+        [TestMethod]
+        public void ShouldSupportInternalNavigationProperties()
+        {
+            var parent = new InternalKeyModel();
+            using (var context = new TestDbContext())
+            {
+                context.InternalKeyModels.Add(parent);
+                context.SaveChanges();
+            } // simulate detach
+
+            parent.Associates = new List<InternalKeyAssociate> { new InternalKeyAssociate() };
+
+            InternalKeyModel model;
+            using (var context = new TestDbContext())
+            {
+                model = context.UpdateGraph(parent, map => map.AssociatedCollection(ikm => ikm.Associates));
+                context.SaveChanges();
+
+                Assert.AreNotEqual(0, model.Id);
+
+                Assert.IsNotNull(model.Associates);
+                Assert.AreEqual(1, model.Associates.Count);
+                Assert.AreNotEqual(0, model.Associates.First().Id);
+            }
+
+            using (var context = new TestDbContext())
+            {
+                var reloadedModel = context.InternalKeyModels
+                        .Include(ikm => ikm.Associates)
+                        .SingleOrDefault(ikm => ikm.Id == model.Id);
+
+                Assert.IsNotNull(reloadedModel);
+                Assert.IsNotNull(reloadedModel.Associates);
+
+                Assert.AreEqual(1, reloadedModel.Associates.Count);
+                Assert.AreEqual(model.Associates.Single().Id, reloadedModel.Associates.Single().Id);
+            }
+        }
+
         [TestMethod]
         public void ShouldSupportNullableKeys()
         {

GraphDiff/GraphDiff/Internal/Graph/GraphNode.cs

@@ -167,7 +167,7 @@ protected static void AttachRequiredNavigationProperties(DbContext context, obje
             var entityType = ObjectContext.GetObjectType(updating.GetType());
             foreach (var navigationProperty in context.GetRequiredNavigationPropertiesForType(updating.GetType()))
             {
-                var navigationPropertyInfo = entityType.GetProperty(navigationProperty.Name);
+                var navigationPropertyInfo = entityType.GetProperty(navigationProperty.Name, BindingFlags.Instance | BindingFlags.NonPublic);
                 var associatedEntity = navigationPropertyInfo.GetValue(updating, null);
 
                 if (associatedEntity != null)
@@ -224,7 +224,7 @@ private static void EnsureConcurrency<T>(IObjectContextAdapter db, T entity1, T
             var conceptualType = metadata.GetItems<EntityType>(DataSpace.CSpace).Single(p => p.FullName == cTypeName);
             var concurrencyProperties = conceptualType.Members
                     .Where(member => member.TypeUsage.Facets.Any(facet => facet.Name == "ConcurrencyMode" && (ConcurrencyMode)facet.Value == ConcurrencyMode.Fixed))
-                    .Select(member => entityType.GetProperty(member.Name))
+                    .Select(member => entityType.GetProperty(member.Name, BindingFlags.Instance | BindingFlags.NonPublic))
                     .ToList();
 
             // Check if concurrency properties are equal