-Removed obsolete constructor from DefaultContractResolver
-Removed obsolete async methods from JsonConvert -Moved contract sharing logic from DefaultContractResolver to CamelCasePropertyNamesContractResolver
This commit is contained in:
@@ -1012,95 +1012,6 @@ namespace Newtonsoft.Json.Tests
|
||||
return (T)converter.ReadJson(reader, typeof(T), null, null);
|
||||
}
|
||||
|
||||
#if !(NET20 || NET35 || PORTABLE40)
|
||||
[Test]
|
||||
public void Async()
|
||||
{
|
||||
Task<string> task = null;
|
||||
|
||||
#pragma warning disable 612,618
|
||||
task = JsonConvert.SerializeObjectAsync(42);
|
||||
#pragma warning restore 612,618
|
||||
task.Wait();
|
||||
|
||||
Assert.AreEqual("42", task.Result);
|
||||
|
||||
#pragma warning disable 612,618
|
||||
task = JsonConvert.SerializeObjectAsync(new[] { 1, 2, 3, 4, 5 }, Formatting.Indented);
|
||||
#pragma warning restore 612,618
|
||||
task.Wait();
|
||||
|
||||
StringAssert.AreEqual(@"[
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5
|
||||
]", task.Result);
|
||||
|
||||
#pragma warning disable 612,618
|
||||
task = JsonConvert.SerializeObjectAsync(DateTime.MaxValue, Formatting.None, new JsonSerializerSettings
|
||||
{
|
||||
DateFormatHandling = DateFormatHandling.MicrosoftDateFormat
|
||||
});
|
||||
#pragma warning restore 612,618
|
||||
task.Wait();
|
||||
|
||||
Assert.AreEqual(@"""\/Date(253402300799999)\/""", task.Result);
|
||||
|
||||
#pragma warning disable 612,618
|
||||
var taskObject = JsonConvert.DeserializeObjectAsync("[]");
|
||||
#pragma warning restore 612,618
|
||||
taskObject.Wait();
|
||||
|
||||
CollectionAssert.AreEquivalent(new JArray(), (JArray)taskObject.Result);
|
||||
|
||||
#pragma warning disable 612,618
|
||||
Task<object> taskVersionArray = JsonConvert.DeserializeObjectAsync("['2.0']", typeof(Version[]), new JsonSerializerSettings
|
||||
{
|
||||
Converters = { new VersionConverter() }
|
||||
});
|
||||
#pragma warning restore 612,618
|
||||
taskVersionArray.Wait();
|
||||
|
||||
Version[] versionArray = (Version[])taskVersionArray.Result;
|
||||
|
||||
Assert.AreEqual(1, versionArray.Length);
|
||||
Assert.AreEqual(2, versionArray[0].Major);
|
||||
|
||||
#pragma warning disable 612,618
|
||||
Task<int> taskInt = JsonConvert.DeserializeObjectAsync<int>("5");
|
||||
#pragma warning restore 612,618
|
||||
taskInt.Wait();
|
||||
|
||||
Assert.AreEqual(5, taskInt.Result);
|
||||
|
||||
#pragma warning disable 612,618
|
||||
var taskVersion = JsonConvert.DeserializeObjectAsync<Version>("'2.0'", new JsonSerializerSettings
|
||||
{
|
||||
Converters = { new VersionConverter() }
|
||||
});
|
||||
#pragma warning restore 612,618
|
||||
taskVersion.Wait();
|
||||
|
||||
Assert.AreEqual(2, taskVersion.Result.Major);
|
||||
|
||||
Movie p = new Movie();
|
||||
p.Name = "Existing,";
|
||||
|
||||
#pragma warning disable 612,618
|
||||
Task taskVoid = JsonConvert.PopulateObjectAsync("{'Name':'Appended'}", p, new JsonSerializerSettings
|
||||
{
|
||||
Converters = new List<JsonConverter> { new StringAppenderConverter() }
|
||||
});
|
||||
#pragma warning restore 612,618
|
||||
|
||||
taskVoid.Wait();
|
||||
|
||||
Assert.AreEqual("Existing,Appended", p.Name);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void SerializeObjectDateTimeZoneHandling()
|
||||
{
|
||||
|
||||
@@ -342,9 +342,6 @@ namespace Newtonsoft.Json.Tests.Schema
|
||||
public class CustomDirectoryInfoMapper : DefaultContractResolver
|
||||
{
|
||||
public CustomDirectoryInfoMapper()
|
||||
#pragma warning disable 612
|
||||
: base(true)
|
||||
#pragma warning restore 612
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
+12
@@ -44,6 +44,18 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
[TestFixture]
|
||||
public class CamelCasePropertyNamesContractResolverTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void EnsureContractsShared()
|
||||
{
|
||||
CamelCasePropertyNamesContractResolver resolver1 = new CamelCasePropertyNamesContractResolver();
|
||||
var contract1 = resolver1.ResolveContract(typeof(CamelCasePropertyNamesContractResolverTests));
|
||||
|
||||
CamelCasePropertyNamesContractResolver resolver2 = new CamelCasePropertyNamesContractResolver();
|
||||
var contract2 = resolver1.ResolveContract(typeof(CamelCasePropertyNamesContractResolverTests));
|
||||
|
||||
Assert.IsTrue(ReferenceEquals(contract1, contract2));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JsonConvertSerializerSettings()
|
||||
{
|
||||
|
||||
@@ -55,9 +55,6 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
private readonly char _startingWithChar;
|
||||
|
||||
public DynamicContractResolver(char startingWithChar)
|
||||
#pragma warning disable 612,618
|
||||
: base(false)
|
||||
#pragma warning restore 612,618
|
||||
{
|
||||
_startingWithChar = startingWithChar;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user