-Fixed DefaultValueHandling.Ignore with decimal properties

-Fixed approximate floating point comparisons
This commit is contained in:
James Newton-King
2012-06-09 13:54:30 +12:00
parent 55854f1682
commit 1b972cd65f
6 changed files with 90 additions and 4 deletions
@@ -33,6 +33,7 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif
using Newtonsoft.Json.Utilities;
namespace Newtonsoft.Json.Tests.Serialization
{
@@ -123,6 +124,14 @@ namespace Newtonsoft.Json.Tests.Serialization
[DefaultValue(-1)]
public long GlobalId { get; set; }
[JsonProperty(PropertyName = "age")]
[DefaultValue(0)]
public int Age { get; set; }
[JsonProperty(PropertyName = "amount")]
[DefaultValue(0.0)]
public decimal Amount { get; set; }
[JsonProperty(PropertyName = "floatUserId")]
[DefaultValue(-1.0d)]
public float FloatGlobalId { get; set; }
@@ -136,6 +145,8 @@ namespace Newtonsoft.Json.Tests.Serialization
{
GlobalId = -1;
FloatGlobalId = -1.0f;
Amount = 0.0m;
Age = 0;
}
}
@@ -151,5 +162,15 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(@"{""firstName"":""blub""}", json);
}
[Test]
public void ApproxEquals()
{
Assert.IsTrue(MathUtils.ApproxEquals(0.0, 0.0));
Assert.IsTrue(MathUtils.ApproxEquals(1000.0, 1000.0000000000001));
Assert.IsFalse(MathUtils.ApproxEquals(1000.0, 1000.000000000001));
Assert.IsFalse(MathUtils.ApproxEquals(0.0, 0.00001));
}
}
}