-JsonObjectAttribute will now force a collection class to be serialized as an object
-Renamed ThreadSafeDictionaryWrapper to ThreadSafeStore
This commit is contained in:
@@ -2623,5 +2623,79 @@ keyword such as type of business.""
|
||||
|
||||
Assert.AreEqual(@"{""bar"":{""baz"":13}}", json);
|
||||
}
|
||||
|
||||
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
|
||||
public class Content : IEnumerable<Content>
|
||||
{
|
||||
[JsonProperty]
|
||||
public List<Content> Children;
|
||||
[JsonProperty]
|
||||
public string Text;
|
||||
|
||||
public IEnumerator GetEnumerator()
|
||||
{
|
||||
return Children.GetEnumerator();
|
||||
}
|
||||
|
||||
IEnumerator<Content> IEnumerable<Content>.GetEnumerator()
|
||||
{
|
||||
return Children.GetEnumerator();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeEnumerableAsObject()
|
||||
{
|
||||
Content content = new Content
|
||||
{
|
||||
Text = "Blah, blah, blah",
|
||||
Children = new List<Content>
|
||||
{
|
||||
new Content { Text = "First" },
|
||||
new Content { Text = "Second" }
|
||||
}
|
||||
};
|
||||
|
||||
string json = JsonConvert.SerializeObject(content, Formatting.Indented);
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""Children"": [
|
||||
{
|
||||
""Children"": null,
|
||||
""Text"": ""First""
|
||||
},
|
||||
{
|
||||
""Children"": null,
|
||||
""Text"": ""Second""
|
||||
}
|
||||
],
|
||||
""Text"": ""Blah, blah, blah""
|
||||
}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeEnumerableAsObject()
|
||||
{
|
||||
string json = @"{
|
||||
""Children"": [
|
||||
{
|
||||
""Children"": null,
|
||||
""Text"": ""First""
|
||||
},
|
||||
{
|
||||
""Children"": null,
|
||||
""Text"": ""Second""
|
||||
}
|
||||
],
|
||||
""Text"": ""Blah, blah, blah""
|
||||
}";
|
||||
|
||||
Content content = JsonConvert.DeserializeObject<Content>(json);
|
||||
|
||||
Assert.AreEqual("Blah, blah, blah", content.Text);
|
||||
Assert.AreEqual(2, content.Children.Count);
|
||||
Assert.AreEqual("First", content.Children[0].Text);
|
||||
Assert.AreEqual("Second", content.Children[1].Text);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -456,7 +456,7 @@ Parameter name: arrayIndex")]
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void sdfs()
|
||||
public void DeserializeClassManually()
|
||||
{
|
||||
string jsonText = @"{
|
||||
""short"":{
|
||||
@@ -486,5 +486,32 @@ Parameter name: arrayIndex")]
|
||||
Assert.AreEqual(0, shortie.Error.Code);
|
||||
Assert.AreEqual("No action taken", shortie.Error.ErrorMessage);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JObjectContainingHtml()
|
||||
{
|
||||
JObject o = new JObject();
|
||||
o["rc"] = new JValue(200);
|
||||
o["m"] = new JValue("");
|
||||
o["o"] = new JValue(@"<div class='s1'>
|
||||
<div class='avatar'>
|
||||
<a href='asdf'>asdf</a><br />
|
||||
<strong>0</strong>
|
||||
</div>
|
||||
<div class='sl'>
|
||||
<p>
|
||||
444444444
|
||||
</p>
|
||||
</div>
|
||||
<div class='clear'>
|
||||
</div>
|
||||
</div>");
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""rc"": 200,
|
||||
""m"": """",
|
||||
""o"": ""<div class='s1'>\r\n <div class='avatar'> \r\n <a href='asdf'>asdf</a><br />\r\n <strong>0</strong>\r\n </div>\r\n <div class='sl'>\r\n <p>\r\n 444444444\r\n </p>\r\n </div>\r\n <div class='clear'>\r\n </div> \r\n</div>""
|
||||
}", o.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user