Merge branch 'master' of https://github.com/reinaldoarrosi/Newtonsoft.Json into reinaldoarrosi-master

This commit is contained in:
James Newton-King
2017-02-16 22:17:58 +13:00
2 changed files with 50 additions and 0 deletions
@@ -1160,6 +1160,32 @@ namespace Newtonsoft.Json.Tests.Converters
""role"": ""Admin1""
}
}
}";
StringAssert.AreEqual(expected, arrayJsonText);
arrayXml = @"<root>
<person id=""1"">
<name>Alan</name>
<url>http://www.google.com</url>
<role json:Array=""true"" xmlns:json=""http://james.newtonking.com/projects/json"">Admin</role>
</person>
</root>";
arrayDoc = new XmlDocument();
arrayDoc.LoadXml(arrayXml);
arrayJsonText = SerializeXmlNode(arrayDoc);
expected = @"{
""root"": {
""person"": {
""@id"": ""1"",
""name"": ""Alan"",
""url"": ""http://www.google.com"",
""role"": [
""Admin""
]
}
}
}";
StringAssert.AreEqual(expected, arrayJsonText);
}