-Fixed compiler warnings
-Changed PopulateObjectAsync to be obsolete
This commit is contained in:
@@ -879,12 +879,16 @@ now brown cow?", '"', true);
|
|||||||
{
|
{
|
||||||
Task<string> task = null;
|
Task<string> task = null;
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
task = JsonConvert.SerializeObjectAsync(42);
|
task = JsonConvert.SerializeObjectAsync(42);
|
||||||
|
#pragma warning restore 612,618
|
||||||
task.Wait();
|
task.Wait();
|
||||||
|
|
||||||
Assert.AreEqual("42", task.Result);
|
Assert.AreEqual("42", task.Result);
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
task = JsonConvert.SerializeObjectAsync(new[] { 1, 2, 3, 4, 5 }, Formatting.Indented);
|
task = JsonConvert.SerializeObjectAsync(new[] { 1, 2, 3, 4, 5 }, Formatting.Indented);
|
||||||
|
#pragma warning restore 612,618
|
||||||
task.Wait();
|
task.Wait();
|
||||||
|
|
||||||
Assert.AreEqual(@"[
|
Assert.AreEqual(@"[
|
||||||
@@ -895,23 +899,29 @@ now brown cow?", '"', true);
|
|||||||
5
|
5
|
||||||
]", task.Result);
|
]", task.Result);
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
task = JsonConvert.SerializeObjectAsync(DateTime.MaxValue, Formatting.None, new JsonSerializerSettings
|
task = JsonConvert.SerializeObjectAsync(DateTime.MaxValue, Formatting.None, new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
DateFormatHandling = DateFormatHandling.MicrosoftDateFormat
|
DateFormatHandling = DateFormatHandling.MicrosoftDateFormat
|
||||||
});
|
});
|
||||||
|
#pragma warning restore 612,618
|
||||||
task.Wait();
|
task.Wait();
|
||||||
|
|
||||||
Assert.AreEqual(@"""\/Date(253402300799999)\/""", task.Result);
|
Assert.AreEqual(@"""\/Date(253402300799999)\/""", task.Result);
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
var taskObject = JsonConvert.DeserializeObjectAsync("[]");
|
var taskObject = JsonConvert.DeserializeObjectAsync("[]");
|
||||||
|
#pragma warning restore 612,618
|
||||||
taskObject.Wait();
|
taskObject.Wait();
|
||||||
|
|
||||||
CollectionAssert.AreEquivalent(new JArray(), (JArray)taskObject.Result);
|
CollectionAssert.AreEquivalent(new JArray(), (JArray)taskObject.Result);
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
Task<object> taskVersionArray = JsonConvert.DeserializeObjectAsync("['2.0']", typeof(Version[]), new JsonSerializerSettings
|
Task<object> taskVersionArray = JsonConvert.DeserializeObjectAsync("['2.0']", typeof(Version[]), new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
Converters = { new VersionConverter() }
|
Converters = { new VersionConverter() }
|
||||||
});
|
});
|
||||||
|
#pragma warning restore 612,618
|
||||||
taskVersionArray.Wait();
|
taskVersionArray.Wait();
|
||||||
|
|
||||||
Version[] versionArray = (Version[])taskVersionArray.Result;
|
Version[] versionArray = (Version[])taskVersionArray.Result;
|
||||||
@@ -919,15 +929,19 @@ now brown cow?", '"', true);
|
|||||||
Assert.AreEqual(1, versionArray.Length);
|
Assert.AreEqual(1, versionArray.Length);
|
||||||
Assert.AreEqual(2, versionArray[0].Major);
|
Assert.AreEqual(2, versionArray[0].Major);
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
Task<int> taskInt = JsonConvert.DeserializeObjectAsync<int>("5");
|
Task<int> taskInt = JsonConvert.DeserializeObjectAsync<int>("5");
|
||||||
|
#pragma warning restore 612,618
|
||||||
taskInt.Wait();
|
taskInt.Wait();
|
||||||
|
|
||||||
Assert.AreEqual(5, taskInt.Result);
|
Assert.AreEqual(5, taskInt.Result);
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
var taskVersion = JsonConvert.DeserializeObjectAsync<Version>("'2.0'", new JsonSerializerSettings
|
var taskVersion = JsonConvert.DeserializeObjectAsync<Version>("'2.0'", new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
Converters = { new VersionConverter() }
|
Converters = { new VersionConverter() }
|
||||||
});
|
});
|
||||||
|
#pragma warning restore 612,618
|
||||||
taskVersion.Wait();
|
taskVersion.Wait();
|
||||||
|
|
||||||
Assert.AreEqual(2, taskVersion.Result.Major);
|
Assert.AreEqual(2, taskVersion.Result.Major);
|
||||||
@@ -935,10 +949,12 @@ now brown cow?", '"', true);
|
|||||||
Movie p = new Movie();
|
Movie p = new Movie();
|
||||||
p.Name = "Existing,";
|
p.Name = "Existing,";
|
||||||
|
|
||||||
|
#pragma warning disable 612,618
|
||||||
Task taskVoid = JsonConvert.PopulateObjectAsync("{'Name':'Appended'}", p, new JsonSerializerSettings
|
Task taskVoid = JsonConvert.PopulateObjectAsync("{'Name':'Appended'}", p, new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
Converters = new List<JsonConverter> { new JsonSerializerTest.StringAppenderConverter() }
|
Converters = new List<JsonConverter> { new JsonSerializerTest.StringAppenderConverter() }
|
||||||
});
|
});
|
||||||
|
#pragma warning restore 612,618
|
||||||
|
|
||||||
taskVoid.Wait();
|
taskVoid.Wait();
|
||||||
|
|
||||||
|
|||||||
@@ -949,6 +949,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <returns>
|
/// <returns>
|
||||||
/// A task that represents the asynchronous populate operation.
|
/// A task that represents the asynchronous populate operation.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
|
[ObsoleteAttribute("PopulateObjectAsync is obsolete. Use the Task.Factory.StartNew method to populate an object with JSON values asynchronously: Task.Factory.StartNew(() => PopulateObject(value, target, settings))")]
|
||||||
public static Task PopulateObjectAsync(string value, object target, JsonSerializerSettings settings)
|
public static Task PopulateObjectAsync(string value, object target, JsonSerializerSettings settings)
|
||||||
{
|
{
|
||||||
return Task.Factory.StartNew(() => PopulateObject(value, target, settings));
|
return Task.Factory.StartNew(() => PopulateObject(value, target, settings));
|
||||||
|
|||||||
Reference in New Issue
Block a user