Merge pull request #66 from andypelzer/master

Fix unit tests (issue #65)
zzzprojects · Jun 11, 2014 · 56a67a3 · 56a67a3
2 parents c029f27 + c13d375
commit 56a67a3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/GraphDiff/GraphDiff/Internal/Graph/GraphNode.cs b/GraphDiff/GraphDiff/Internal/Graph/GraphNode.cs
@@ -167,9 +167,9 @@ 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, BindingFlags.Instance | BindingFlags.NonPublic);
-                var associatedEntity = navigationPropertyInfo.GetValue(updating, null);
+                var navigationPropertyInfo = entityType.GetProperty(navigationProperty.Name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
 
+                var associatedEntity = navigationPropertyInfo.GetValue(updating, null);
                 if (associatedEntity != null)
                 {
                     associatedEntity = FindEntityByKey(context, associatedEntity);
@@ -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, BindingFlags.Instance | BindingFlags.NonPublic))
+                    .Select(member => entityType.GetProperty(member.Name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public))
                     .ToList();
 
             // Check if concurrency properties are equal