-Formatting

-Build
This commit is contained in:
James Newton-King
2015-12-04 23:54:38 +13:00
parent c96779dc10
commit eb0cbd6a75
334 changed files with 3952 additions and 514 deletions
+10 -3
View File
@@ -345,7 +345,6 @@ namespace Newtonsoft.Json.Tests
""Property5"":""5""
}";
var watch = new Stopwatch();
watch.Start();
for (long iteration = 0; iteration < totalIterations; ++iteration)
@@ -584,7 +583,6 @@ If attributes are not mentioned, default values are used in each case.
test.dictionary = new Dictionary<string, int> { { "Val & asd1", 1 }, { "Val2 & asd1", 3 }, { "Val3 & asd1", 4 } };
test.Address1.Street = "fff Street";
test.Address1.Entered = DateTime.Now.AddDays(20);
@@ -811,7 +809,9 @@ If attributes are not mentioned, default values are used in each case.
GC.Collect();
if (warmUp)
{
Deserialize<T>(method, json);
}
Stopwatch timed = new Stopwatch();
timed.Start();
@@ -841,7 +841,9 @@ If attributes are not mentioned, default values are used in each case.
//serializer.MissingMemberHandling = Newtonsoft.Json.MissingMemberHandling.Ignore;
//serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
if (isoDateTimeConverter)
{
serializer.Converters.Add(new IsoDateTimeConverter());
}
var value = (T)serializer.Deserialize(new StringReader(json), type);
return value;
@@ -973,7 +975,9 @@ If attributes are not mentioned, default values are used in each case.
return DeserializeJsonNet<T>((string)json, true);
case SerializeMethod.JsonNetManual:
if (typeof(T) == typeof(TestClass))
{
return (T)(object)DeserializeJsonNetManual((string)json);
}
return default(T);
case SerializeMethod.JsonNetBinary:
@@ -1020,9 +1024,13 @@ If attributes are not mentioned, default values are used in each case.
};
if (rootValue == null)
{
rootValue = currentValue;
}
if (parentValue != null)
{
parentValue.Child = currentValue;
}
parentValue = currentValue;
}
@@ -1206,7 +1214,6 @@ If attributes are not mentioned, default values are used in each case.
private Address _Address1 = new Address();
[DataMember]
public List<Address> Addresses
{