-Added covariance to IJEnumerable type parameter

-Fixed inaccessible private getter/setters on base classes
This commit is contained in:
JamesNK
2010-10-16 10:45:36 +00:00
parent 336f14b3d2
commit 1703992773
4 changed files with 83 additions and 4 deletions
@@ -698,6 +698,21 @@ keyword such as type of business.""
Assert.AreEqual(new DateTime(2000, 10, 15, 5, 5, 5, DateTimeKind.Utc), d);
}
#if !(NET20 || NET35 || SILVERLIGHT)
[Test]
public void CovariantIJEnumerable()
{
IEnumerable<JObject> o = new[]
{
JObject.FromObject(new {First = 1, Second = 2}),
JObject.FromObject(new {First = 1, Second = 2})
};
IJEnumerable<JToken> values = o.Properties();
Assert.AreEqual(4, values.Count());
}
#endif
[Test]
public void ChildrenExtension()
{
@@ -3697,5 +3697,54 @@ keyword such as type of business.""
Assert.AreEqual(2, obj.Position.Y);
Assert.AreEqual(3, obj.Position.Z);
}
[JsonObject(MemberSerialization.OptIn)]
public class Derived : Base
{
[JsonProperty]
public string IDoWork { get; private set; }
private Derived() { }
internal Derived(string dontWork, string doWork)
: base(dontWork)
{
IDoWork = doWork;
}
}
[JsonObject(MemberSerialization.OptIn)]
public class Base
{
[JsonProperty]
public string IDontWork { get; private set; }
protected Base() { }
internal Base(string dontWork)
{
IDontWork = dontWork;
}
}
[Test]
public void PrivateSetterOnBaseClassProperty()
{
var derived = new Derived("meh", "woo");
var settings = new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.Objects,
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
};
string json = JsonConvert.SerializeObject(derived, Formatting.Indented, settings);
var meh = JsonConvert.DeserializeObject<Base>(json, settings);
Assert.AreEqual(((Derived)meh).IDoWork, "woo");
Assert.AreEqual(meh.IDontWork, "meh");
}
}
}