CSHARP-2646: DateTimeOffsetSerializer should be forgiving of the actual numeric types it encounters during deserialization.

Author: rstam

src/MongoDB.Bson/Serialization/Serializers/DateTimeOffsetSerializer.cs

@@ -105,8 +105,8 @@ public override DateTimeOffset Deserialize(BsonDeserializationContext context, B
             {
                 case BsonType.Array:
                     bsonReader.ReadStartArray();
-                    ticks = bsonReader.ReadInt64();
-                    offset = TimeSpan.FromMinutes(bsonReader.ReadInt32());
+                    ticks = _int64Serializer.Deserialize(context);
+                    offset = TimeSpan.FromMinutes(_int32Serializer.Deserialize(context));
                     bsonReader.ReadEndArray();
                     return new DateTimeOffset(ticks, offset);
 

tests/MongoDB.Bson.Tests/Serialization/Serializers/DateTimeOffsetSerializerTests.cs

@@ -87,6 +87,34 @@ public void Deserialize_should_return_expected_result(string json, string expect
             result.Should().Be(DateTimeOffset.Parse(expectedResult));
         }
 
+        [Theory]
+        [InlineData("{ x : [{ $numberDouble : '0' }, { $numberDouble : '0' }] }", "0001-01-01T00:00:00+00:00")]
+        [InlineData("{ x : [{ $numberDouble : '621355968000000000' }, { $numberDouble : '0' }] }", "1970-01-01T00:00:00+00:00")]
+        [InlineData("{ x : [{ $numberDouble : '621355968000000000' }, { $numberDouble : '60' }] }", "1970-01-01T00:00:00+01:00")]
+        [InlineData("{ x : [{ $numberDouble : '621355968000000000' }, { $numberDouble : '-60' }] }", "1970-01-01T00:00:00-01:00")]
+        [InlineData("{ x : { DateTime : 'ignored', Ticks : { $numberDouble : 0 }, Offset : { $numberDouble : '0' } } }", "0001-01-01T00:00:00Z")]
+        [InlineData("{ x : { DateTime : 'ignored', Ticks : { $numberDouble : '621355968000000000' }, Offset : { $numberDouble : '0' } } }", "1970-01-01T00:00:00Z")]
+        [InlineData("{ x : { DateTime : 'ignored', Ticks : { $numberDouble : '621355968000000000' }, Offset : { $numberDouble : '60' } } }", "1970-01-01T00:00:00+01:00")]
+        [InlineData("{ x : { DateTime : 'ignored', Ticks : { $numberDouble : '621355968000000000' }, Offset : { $numberDouble : '-60' } } }", "1970-01-01T00:00:00-01:00")]
+        public void Deserialize_should_be_forgiving_of_actual_numeric_types(string json, string expectedResult)
+        {
+            var x = DateTimeOffset.Parse(expectedResult);
+            var m = BsonUtils.ToMillisecondsSinceEpoch(x.UtcDateTime);
+            var subject = new DateTimeOffsetSerializer();
+
+            DateTimeOffset result;
+            using (var reader = new JsonReader(json))
+            {
+                reader.ReadStartDocument();
+                reader.ReadName("x");
+                var context = BsonDeserializationContext.CreateRoot(reader);
+                result = subject.Deserialize(context);
+                reader.ReadEndDocument();
+            }
+
+            result.Should().Be(DateTimeOffset.Parse(expectedResult));
+        }
+
         [Theory]
         [InlineData(BsonType.Array, "0001-01-01T00:00:00Z", "{ \"x\" : [{ \"$numberLong\" : \"0\" }, { \"$numberInt\" : \"0\" }] }")]
         [InlineData(BsonType.Array, "1970-01-01T00:00:00Z", "{ \"x\" : [{ \"$numberLong\" : \"621355968000000000\" }, { \"$numberInt\" : \"0\" }] }")]