Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json
This commit is contained in:
@@ -39,7 +39,7 @@
|
|||||||
The way to tackle this scenario is to add the
|
The way to tackle this scenario is to add the
|
||||||
<codeEntityReference>T:System.Runtime.Serialization.DataContractAttribute</codeEntityReference>
|
<codeEntityReference>T:System.Runtime.Serialization.DataContractAttribute</codeEntityReference>
|
||||||
to the class and
|
to the class and
|
||||||
<codeEntityReference>T:System.Runtime.Serialization.DataMemberAttributes</codeEntityReference>
|
<codeEntityReference>T:System.Runtime.Serialization.DataMemberAttribute</codeEntityReference>
|
||||||
to the properties to serialize. This is opt-in
|
to the properties to serialize. This is opt-in
|
||||||
serialization, only the properties you mark up with be serialized, compared to
|
serialization, only the properties you mark up with be serialized, compared to
|
||||||
opt-out serialization using JsonIgnoreAttribute.</para>
|
opt-out serialization using JsonIgnoreAttribute.</para>
|
||||||
|
|||||||
@@ -232,6 +232,39 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
]", json);
|
]", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeDouble()
|
||||||
|
{
|
||||||
|
JsonObject o = new JsonObject();
|
||||||
|
o["zero"] = JsonValue.CreateNumberValue(0);
|
||||||
|
o["int"] = JsonValue.CreateNumberValue(1);
|
||||||
|
o["smallfraction"] = JsonValue.CreateNumberValue(3.0000000000000009);
|
||||||
|
o["double"] = JsonValue.CreateNumberValue(1.1);
|
||||||
|
o["probablyint"] = JsonValue.CreateNumberValue(1.0);
|
||||||
|
o["Epsilon"] = JsonValue.CreateNumberValue(double.Epsilon);
|
||||||
|
o["MinValue"] = JsonValue.CreateNumberValue(double.MinValue);
|
||||||
|
o["MaxValue"] = JsonValue.CreateNumberValue(double.MaxValue);
|
||||||
|
o["NaN"] = JsonValue.CreateNumberValue(double.NaN);
|
||||||
|
o["NegativeInfinity"] = JsonValue.CreateNumberValue(double.NegativeInfinity);
|
||||||
|
o["PositiveInfinity"] = JsonValue.CreateNumberValue(double.PositiveInfinity);
|
||||||
|
|
||||||
|
string json = JsonConvert.SerializeObject(o, Formatting.Indented);
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""PositiveInfinity"": Infinity,
|
||||||
|
""NegativeInfinity"": -Infinity,
|
||||||
|
""MinValue"": -1.7976931348623157E+308,
|
||||||
|
""double"": 1.1,
|
||||||
|
""int"": 1,
|
||||||
|
""zero"": 0,
|
||||||
|
""Epsilon"": 4.94065645841247E-324,
|
||||||
|
""MaxValue"": 1.7976931348623157E+308,
|
||||||
|
""NaN"": NaN,
|
||||||
|
""smallfraction"": 3.0000000000000009,
|
||||||
|
""probablyint"": 1
|
||||||
|
}", json);
|
||||||
|
}
|
||||||
|
|
||||||
//[Test]
|
//[Test]
|
||||||
public void DeserializePerformance()
|
public void DeserializePerformance()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -66,7 +66,14 @@ namespace Newtonsoft.Json.Converters
|
|||||||
break;
|
break;
|
||||||
case JsonValueType.Number:
|
case JsonValueType.Number:
|
||||||
{
|
{
|
||||||
writer.WriteValue(value.GetNumber());
|
// JsonValue doesn't support integers
|
||||||
|
// serialize whole numbers without a decimal point
|
||||||
|
double d = value.GetNumber();
|
||||||
|
bool isInteger = (d % 1 == 0);
|
||||||
|
if (isInteger && d <= long.MaxValue && d >= long.MinValue)
|
||||||
|
writer.WriteValue(Convert.ToInt64(d));
|
||||||
|
else
|
||||||
|
writer.WriteValue(d);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case JsonValueType.Object:
|
case JsonValueType.Object:
|
||||||
|
|||||||
Reference in New Issue
Block a user