Fixed bug in parsing decimal values (#9)

bbowyersmyth · Apr 29, 2024 · 62a3b5c · 62a3b5c
1 parent 2953313
commit 62a3b5c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/src/BinaryFormatDataStructure/BinaryFormatterReader.cs b/src/BinaryFormatDataStructure/BinaryFormatterReader.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
@@ -509,7 +510,7 @@ private object ReadArray(ArraySinglePrimitiveRecord record)
 
                         for (int i = 0; i < result.Length; i++)
                         {
-                            result[i] = _reader.ReadDecimal();
+                            result[i] = decimal.Parse(_reader.ReadString(), CultureInfo.InvariantCulture);
                         }
 
                         return result;

diff --git a/src/BinaryFormatDataStructure/PrimitiveReader.cs b/src/BinaryFormatDataStructure/PrimitiveReader.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IO;
 using System.Runtime.Serialization;
 
@@ -61,7 +62,7 @@ public static object Read(PrimitiveType type, BinaryReader reader)
                     return reader.ReadUInt64();
 
                 case PrimitiveType.Decimal:
-                    return reader.ReadDecimal();
+                    return decimal.Parse(reader.ReadString(), CultureInfo.InvariantCulture);
 
                 case PrimitiveType.TimeSpan:
                     return ReadTimeSpan(reader);

diff --git a/src/Tests/CustomClassTests.cs b/src/Tests/CustomClassTests.cs
@@ -27,7 +27,7 @@ public void TestCustomClass()
             BinaryObject objectResult = (BinaryObject)result;
             Assert.AreEqual("Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", objectResult.AssemblyName);
             Assert.AreEqual("BinaryFormatDataStructureTests.CustomClassTests+TestModel", objectResult.TypeName);
-            Assert.AreEqual(2, objectResult.Keys.Count());
+            Assert.AreEqual(3, objectResult.Keys.Count());
 
             var enumer = objectResult.GetEnumerator();
             enumer.MoveNext();
@@ -41,6 +41,12 @@ public void TestCustomClass()
             Assert.AreEqual("_two", current.Key);
             Assert.IsInstanceOfType(current.Value, typeof(bool));
             Assert.AreEqual(true, (bool)current.Value);
+
+            enumer.MoveNext();
+            current = enumer.Current;
+            Assert.AreEqual("_three", current.Key);
+            Assert.IsInstanceOfType(current.Value, typeof(decimal));
+            Assert.AreEqual(decimal.MaxValue, (decimal)current.Value);
         }
 
         [TestMethod]
@@ -99,6 +105,8 @@ private class TestModel
 #pragma warning restore IDE0044 // Add readonly modifier
 
             public decimal Three { get { return 0; } set { } }
+
+            private decimal _three = decimal.MaxValue;
         }
 
         private enum TestEnum

diff --git a/src/Tests/PrimitiveArrayTests.cs b/src/Tests/PrimitiveArrayTests.cs
@@ -29,6 +29,26 @@ public void TestIntArray()
             Assert.AreEqual(3, arrayResult[2]);
         }
 
+        [TestMethod]
+        public void TestDecimalArray()
+        {
+            BinaryFormatter formatter = new BinaryFormatter();
+            MemoryStream ms = new MemoryStream();
+
+            formatter.Serialize(ms, new decimal[] { 1.1m, 2.2m, 3.3m });
+            ms.Position = 0;
+
+            object result = NRBFReader.ReadStream(ms);
+
+            Assert.IsInstanceOfType(result, typeof(decimal[]));
+
+            decimal[] arrayResult = (decimal[])result;
+            Assert.AreEqual(3, arrayResult.Length);
+            Assert.AreEqual(1.1m, arrayResult[0]);
+            Assert.AreEqual(2.2m, arrayResult[1]);
+            Assert.AreEqual(3.3m, arrayResult[2]);
+        }
+
         [TestMethod]
         public void TestTimeSpanArray()
         {