yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added ConvertToNullableDecimalTest and check that fixes the decimal save issue

Browse Source
This commit is contained in:
Robert
2018-02-08 16:21:09 +01:00
parent 6618388973
commit 4423571eaa
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/ObjectExtensions.cs
View File

@@ -156,6 +156,11 @@ namespace Umbraco.Core
if (inner.Success)
{
input = inner.Result; // Now fall on through...
if (input is decimal)
{
target = underlying;
}
}
else
{
@@ -212,7 +217,7 @@ namespace Umbraco.Core
var convertible2 = input as IConvertible;
if (convertible2 != null)
{
return Attempt.Succeed(Convert.ChangeType(convertible2, Nullable.GetUnderlyingType(target) ?? target));
return Attempt.Succeed(Convert.ChangeType(convertible2, target));
}
}
catch (Exception e)

36
src/Umbraco.Tests/TryConvertToTests.cs
View File

@@ -94,6 +94,42 @@ namespace Umbraco.Tests
Assert.AreEqual(100m, conv.Result);
}
[Test]
public void ConvertToNullableDecimalTest()
{
var conv = "100".TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100m, conv.Result);
conv = "100.000".TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100m, conv.Result);
conv = "100,000".TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100m, conv.Result);
conv = "100.001".TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100.001m, conv.Result);
conv = 100m.TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100m, conv.Result);
conv = 100.000m.TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100m, conv.Result);
conv = 100.001m.TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100.001m, conv.Result);
conv = 100.TryConvertTo<decimal?>();
Assert.IsTrue(conv);
Assert.AreEqual(100m, conv.Result);
}
[Test]
public void ConvertToDateTimeTest()
{