Allow commas in decimals + add tests for nullable float numbers

Author: mythz

src/ServiceStack.Text/Common/DeserializeBuiltin.cs

@@ -66,7 +66,7 @@ private static ParseStringDelegate GetParseFn()
                     case TypeCode.Double:
                         return value => double.Parse(value, CultureInfo.InvariantCulture);
                     case TypeCode.Decimal:
-                        return value => decimal.Parse(value, NumberStyles.Float, CultureInfo.InvariantCulture);
+                        return value => decimal.Parse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture);
                     case TypeCode.DateTime:
                         return value => DateTimeSerializer.ParseShortestXsdDateTime(value);
                     case TypeCode.Char:
@@ -119,7 +119,7 @@ private static ParseStringDelegate GetParseFn()
                     case TypeCode.Double:
                         return value => string.IsNullOrEmpty(value) ? (double?)null : double.Parse(value, CultureInfo.InvariantCulture);
                     case TypeCode.Decimal:
-                        return value => string.IsNullOrEmpty(value) ? (decimal?)null : decimal.Parse(value, CultureInfo.InvariantCulture);
+                        return value => string.IsNullOrEmpty(value) ? (decimal?)null : decimal.Parse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture);
                     case TypeCode.DateTime:
                         return value => DateTimeSerializer.ParseShortestNullableXsdDateTime(value);
                     case TypeCode.Char:

tests/ServiceStack.Text.Tests/JsvTests/JsvBasicDataTests.cs

@@ -34,5 +34,73 @@ public void Can_serialize_ModelWithFloatTypes()
             fromJsv = jsv.FromJsv<ModelWithFloatTypes>();
             Assert.That(fromJsv, Is.EqualTo(dto));
         }
+
+        [Test]
+        public void Can_serialize_ModelWithNullableFloatTypes()
+        {
+            var dto = new ModelWithNullableFloatTypes
+            {
+                Float = 1.1f,
+                Double = 2.2d,
+                Decimal = 3.3m
+            };
+
+            var jsv = dto.ToJsv();
+            Assert.That(jsv, Is.EqualTo("{Float:1.1,Double:2.2,Decimal:3.3}"));
+
+            var fromJsv = jsv.FromJsv<ModelWithNullableFloatTypes>();
+            Assert.That(fromJsv, Is.EqualTo(dto));
+
+            dto = new ModelWithNullableFloatTypes
+            {
+                Float = 111111.1f,
+                Double = 2222222.22d,
+                Decimal = 33333333.333m
+            };
+
+            jsv = dto.ToJsv();
+            Assert.That(jsv, Is.EqualTo("{Float:111111.1,Double:2222222.22,Decimal:33333333.333}"));
+
+            fromJsv = jsv.FromJsv<ModelWithNullableFloatTypes>();
+            Assert.That(fromJsv, Is.EqualTo(dto));
+        }
+
+        [Test]
+        public void Can_serialize_ModelWithFloatTypes_From_String()
+        {
+            var dto = new ModelWithFloatTypes
+            {
+                Float = 1111.1f,
+                Double = 2222.2d,
+                Decimal = 3333.3m
+            };
+
+            var jsv = "{Float:\"1111.1\",Double:\"2222.2\",Decimal:\"3333.3\"}";
+            var fromJsv = jsv.FromJsv<ModelWithFloatTypes>();
+            Assert.That(fromJsv, Is.EqualTo(dto));
+
+            jsv = "{Float:\"1,111.1\",Double:\"2,222.2\",Decimal:\"3,333.3\"}";
+            fromJsv = jsv.FromJsv<ModelWithFloatTypes>();
+            Assert.That(fromJsv, Is.EqualTo(dto));
+        }
+
+        [Test]
+        public void Can_serialize_ModelWithNullableFloatTypes_From_String()
+        {
+            var dto = new ModelWithNullableFloatTypes
+            {
+                Float = 1111.1f,
+                Double = 2222.2d,
+                Decimal = 3333.3m
+            };
+
+            var jsv = "{Float:\"1111.1\",Double:\"2222.2\",Decimal:\"3333.3\"}";
+            var fromJsv = jsv.FromJsv<ModelWithNullableFloatTypes>();
+            Assert.That(fromJsv, Is.EqualTo(dto));
+
+            jsv = "{Float:\"1,111.1\",Double:\"2,222.2\",Decimal:\"3,333.3\"}";
+            fromJsv = jsv.FromJsv<ModelWithNullableFloatTypes>();
+            Assert.That(fromJsv, Is.EqualTo(dto));
+        }
     }
 }

tests/ServiceStack.Text.Tests/Shared/ModelWithFloatTypes.cs

@@ -8,7 +8,9 @@ public class ModelWithFloatTypes
 
         protected bool Equals(ModelWithFloatTypes other)
         {
-            return Float.Equals(other.Float) && Double.Equals(other.Double) && Decimal == other.Decimal;
+            return Float.Equals(other.Float) 
+                && Double.Equals(other.Double) 
+                && Decimal == other.Decimal;
         }
 
         public override bool Equals(object obj)
@@ -30,4 +32,35 @@ public override int GetHashCode()
             }
         }
     }
+
+    public class ModelWithNullableFloatTypes
+    {
+        public float? Float { get; set; }
+        public double? Double { get; set; }
+        public decimal? Decimal { get; set; }
+
+        protected bool Equals(ModelWithNullableFloatTypes other)
+        {
+            return Float.Equals(other.Float) && Double.Equals(other.Double) && Decimal == other.Decimal;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((ModelWithNullableFloatTypes) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Float.GetHashCode();
+                hashCode = (hashCode * 397) ^ Double.GetHashCode();
+                hashCode = (hashCode * 397) ^ Decimal.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
 }