Fix for "inherited" interfaces

This commit is contained in:
ravensorb
2015-04-01 23:08:58 -05:00
parent f809e30a51
commit 16d0c09027
2 changed files with 29 additions and 5 deletions
@@ -47,7 +47,12 @@ using NUnit.Framework;
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
{ {
public interface ITaskRepository public interface IBase
{
DateTime CreatedOn { get; set; }
}
public interface ITaskRepository : IBase
{ {
string ConnectionString { get; set; } string ConnectionString { get; set; }
} }
@@ -58,7 +63,12 @@ namespace Newtonsoft.Json.Tests.Serialization
string Level { get; set; } string Level { get; set; }
} }
public class TaskRepository : ITaskRepository public class Base : IBase
{
public DateTime CreatedOn { get; set; }
}
public class TaskRepository : Base, ITaskRepository
{ {
public string ConnectionString { get; set; } public string ConnectionString { get; set; }
} }
@@ -202,7 +212,8 @@ namespace Newtonsoft.Json.Tests.Serialization
'Level': 'Debug' 'Level': 'Debug'
}, },
'Repository': { 'Repository': {
'ConnectionString': 'server=.' 'ConnectionString': 'server=.',
'CreatedOn': '2015-04-01 20:00'
}, },
'People': [ 'People': [
{ {
@@ -223,6 +234,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.IsNotNull(o); Assert.IsNotNull(o);
Assert.IsNotNull(o.Logger); Assert.IsNotNull(o.Logger);
Assert.IsNotNull(o.Repository); Assert.IsNotNull(o.Repository);
Assert.IsNotNull(o.Repository.CreatedOn);
Assert.AreEqual(2, count); Assert.AreEqual(2, count);
@@ -883,8 +883,20 @@ namespace Newtonsoft.Json.Utilities
{ {
ValidationUtils.ArgumentNotNull(targetType, "targetType"); ValidationUtils.ArgumentNotNull(targetType, "targetType");
List<PropertyInfo> propertyInfos = new List<PropertyInfo>(targetType.GetProperties(bindingAttr)); List<PropertyInfo> propertyInfos;
GetChildPrivateProperties(propertyInfos, targetType, bindingAttr);
if (!targetType.IsInterface())
{
propertyInfos = new List<PropertyInfo>(targetType.GetProperties(bindingAttr));
}
else
{
propertyInfos = (new Type[] { targetType })
.Concat(targetType.GetInterfaces())
.SelectMany(i => i.GetProperties()).ToList();
}
GetChildPrivateProperties(propertyInfos, targetType, bindingAttr);
// a base class private getter/setter will be inaccessable unless the property was gotten from the base class // a base class private getter/setter will be inaccessable unless the property was gotten from the base class
for (int i = 0; i < propertyInfos.Count; i++) for (int i = 0; i < propertyInfos.Count; i++)