Skip to content

Commit 40e69fe

Browse files
author
rstam
committed
CSHARP-594: Fixed similar issue in MapToBsonValue and added unit tests.
1 parent dc92da4 commit 40e69fe

File tree

4 files changed

+101
-20
lines changed

4 files changed

+101
-20
lines changed

‎Bson/ObjectModel/BsonTypeMapper.cs

+13-20
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,6 @@ public static class BsonTypeMapper
3434
private static Dictionary<Type, Conversion> __fromMappings = new Dictionary<Type, Conversion>
3535
{
3636
{ typeof(bool), Conversion.NewBsonBoolean },
37-
{ typeof(BsonArray), Conversion.None },
38-
{ typeof(BsonBinaryData), Conversion.None },
39-
{ typeof(BsonBoolean), Conversion.None },
40-
{ typeof(BsonDateTime), Conversion.None },
41-
{ typeof(BsonDocument), Conversion.None },
42-
{ typeof(BsonDouble), Conversion.None },
43-
{ typeof(BsonInt32), Conversion.None },
44-
{ typeof(BsonInt64), Conversion.None },
45-
{ typeof(BsonJavaScript), Conversion.None },
46-
{ typeof(BsonJavaScriptWithScope), Conversion.None },
47-
{ typeof(BsonMaxKey), Conversion.None },
48-
{ typeof(BsonMinKey), Conversion.None },
49-
{ typeof(BsonNull), Conversion.None },
50-
{ typeof(BsonObjectId), Conversion.None },
51-
{ typeof(BsonRegularExpression), Conversion.None },
52-
{ typeof(BsonString), Conversion.None },
53-
{ typeof(BsonSymbol), Conversion.None },
54-
{ typeof(BsonTimestamp), Conversion.None },
55-
{ typeof(BsonUndefined), Conversion.None },
56-
{ typeof(BsonValue), Conversion.None },
5737
{ typeof(byte), Conversion.ByteToBsonInt32 },
5838
{ typeof(byte[]), Conversion.ByteArrayToBsonBinary },
5939
{ typeof(DateTime), Conversion.DateTimeToBsonDateTime },
@@ -198,6 +178,16 @@ public static BsonValue MapToBsonValue(object value, BsonType bsonType)
198178
}
199179
}
200180

181+
// handle subclasses of BsonDocument (like QueryDocument) correctly
182+
if (bsonType == BsonType.Document)
183+
{
184+
var bsonDocument = value as BsonDocument;
185+
if (bsonDocument != null)
186+
{
187+
return bsonDocument;
188+
}
189+
}
190+
201191
var valueType = value.GetType();
202192
if (valueType.IsEnum)
203193
{
@@ -443,9 +433,12 @@ public static bool TryMapToBsonValue(object value, out BsonValue bsonValue)
443433
return true;
444434
}
445435

436+
// also handles subclasses of BsonDocument (like QueryDocument) correctly
446437
bsonValue = value as BsonValue;
447438
if (bsonValue != null)
439+
{
448440
return true;
441+
}
449442

450443
var valueType = value.GetType();
451444
if (valueType.IsEnum)

‎DriverUnitTests/DriverUnitTests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
<Compile Include="Jira\CSharp471Tests.cs" />
174174
<Compile Include="Jira\CSharp524Tests.cs" />
175175
<Compile Include="Jira\CSharp522Tests.cs" />
176+
<Compile Include="Jira\CSharp594Tests.cs" />
176177
<Compile Include="Jira\CSharp77Tests.cs" />
177178
<Compile Include="Jira\CSharp92Tests.cs" />
178179
<Compile Include="Jira\CSharp93Tests.cs" />

‎DriverUnitTests/Jira/CSharp594Tests.cs

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/* Copyright 2010-2012 10gen Inc.
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
using System;
17+
using System.Collections.Generic;
18+
using System.Linq;
19+
using System.Text;
20+
using NUnit.Framework;
21+
22+
using MongoDB.Bson;
23+
using MongoDB.Driver;
24+
using MongoDB.Driver.Linq;
25+
using MongoDB.Bson.Serialization.Attributes;
26+
using MongoDB.Driver.Builders;
27+
28+
namespace MongoDB.DriverUnitTests.Jira.CSharp594
29+
{
30+
[TestFixture]
31+
public class CSharp594Tests
32+
{
33+
[Test]
34+
public void TestTryMapToBsonValueWithBsonValues()
35+
{
36+
// test all the BsonValue subclasses because we removed them from the __fromMappings table
37+
var testValues = new BsonValue[]
38+
{
39+
new BsonArray(),
40+
new BsonBinaryData(new byte[0]),
41+
BsonBoolean.True,
42+
new BsonDateTime(DateTime.UtcNow),
43+
new BsonDocument("x", 1),
44+
new BsonDouble(1.0),
45+
new BsonInt32(1),
46+
new BsonInt64(1),
47+
new BsonJavaScript("code"),
48+
new BsonJavaScriptWithScope("code", new BsonDocument("x", 1)),
49+
BsonMaxKey.Value,
50+
BsonMinKey.Value,
51+
BsonNull.Value,
52+
new BsonObjectId(ObjectId.GenerateNewId()),
53+
new BsonRegularExpression("pattern"),
54+
new BsonString("abc"),
55+
BsonSymbol.Create("xyz"),
56+
new BsonTimestamp(0),
57+
BsonUndefined.Value
58+
};
59+
foreach (var testValue in testValues)
60+
{
61+
BsonValue bsonValue;
62+
var ok = BsonTypeMapper.TryMapToBsonValue(testValue, out bsonValue);
63+
Assert.AreEqual(true, ok);
64+
Assert.AreSame(testValue, bsonValue);
65+
}
66+
}
67+
68+
[Test]
69+
public void TestTryMapToBsonValueWithQueryDocument()
70+
{
71+
var query = new QueryDocument("x", 1);
72+
BsonValue bsonValue;
73+
var ok = BsonTypeMapper.TryMapToBsonValue(query, out bsonValue);
74+
Assert.AreEqual(true, ok);
75+
Assert.AreSame(query, bsonValue);
76+
}
77+
78+
[Test]
79+
public void TestMapToBsonValueWithQueryDocument()
80+
{
81+
var query = new QueryDocument("x", 1);
82+
var bsonDocument = BsonTypeMapper.MapToBsonValue(query, BsonType.Document);
83+
Assert.AreSame(query, bsonDocument);
84+
}
85+
}
86+
}

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ http://jira.mongodb.org/browse/CSHARP
2727
* Teun Duynstee [email protected]
2828
* Ken Egozi [email protected]
2929
* Simon Green [email protected]
30+
* Oleg Kosmakov [email protected]
3031
* Brian Knight [email protected]
3132
* Richard Kreuter [email protected]
3233
* Kevin Lewis [email protected]

0 commit comments

Comments
 (0)