Merge pull request #63 from emiaj/indexer_test

Indexer test
DarthFubuMVC · Feb 20, 2013 · dfa701b · dfa701b
2 parents c635657 + a163310
commit dfa701b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/FubuCore.Testing/Reflection/ReflectionHelperTester.cs b/src/FubuCore.Testing/Reflection/ReflectionHelperTester.cs
@@ -320,9 +320,10 @@ public void get_value_by_indexer_when_the_indexer_is_variable_reference_of_a_com
         public void get_owner_type_by_indexer()
         {
             var accessor = ReflectionHelper.GetAccessor<Target>(x => x.Child.Grandchildren[1].Deep.Color);
-            accessor.OwnerType.ShouldEqual(typeof (DeepTarget));
+            accessor.OwnerType.ShouldEqual(typeof(DeepTarget));
 
             ReflectionHelper.GetAccessor<Target>(x => x.Child.Grandchildren[1]).OwnerType.ShouldEqual(typeof(ChildTarget));
+            ReflectionHelper.GetAccessor<Target>(x => x.Child.Grandchildren[1].Name).OwnerType.ShouldEqual(typeof(GrandChildTarget));
         }
 
         [Test]

diff --git a/src/FubuCore/Reflection/PropertyChain.cs b/src/FubuCore/Reflection/PropertyChain.cs
@@ -67,7 +67,8 @@ public Type OwnerType
                 }
 
                 var propertyGetter = _chain.Last() as PropertyValueGetter;
-                return propertyGetter != null ? propertyGetter.PropertyInfo.PropertyType : null;
+                if (propertyGetter != null) return propertyGetter.PropertyInfo.PropertyType;
+                return InnerProperty != null ? InnerProperty.DeclaringType : null;
             }
         }