Skip to content

Commit a3e4d1a

Browse files
papafepapafe
committed
Test fixes
1 parent b375316 commit a3e4d1a

File tree

9 files changed

+44
-35
lines changed

9 files changed

+44
-35
lines changed

‎src/MongoDB.Driver/ChangeStreamHelper.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public static ChangeStreamOperation<TResult> CreateChangeStreamOperation<TResult
3030
ReadConcern readConcern,
3131
MessageEncoderSettings messageEncoderSettings,
3232
bool retryRequested,
33-
ExpressionTranslationOptions translationOptions)
33+
ExpressionTranslationOptions translationOptions,
34+
IBsonSerializationDomain serializationDomain)
3435
{
35-
var serializationDomain = messageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null);
3636
var renderedPipeline = RenderPipeline(pipeline, BsonDocumentSerializer.Instance, serializationDomain, translationOptions);
3737

3838
var operation = new ChangeStreamOperation<TResult>(
@@ -55,10 +55,9 @@ public static ChangeStreamOperation<TResult> CreateChangeStreamOperation<TResult
5555
ReadConcern readConcern,
5656
MessageEncoderSettings messageEncoderSettings,
5757
bool retryRequested,
58-
ExpressionTranslationOptions translationOptions)
58+
ExpressionTranslationOptions translationOptions,
59+
IBsonSerializationDomain serializationDomain)
5960
{
60-
//FP Need to stop using the message encoder settings to pass the serialization domain.
61-
var serializationDomain = messageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null);
6261
var renderedPipeline = RenderPipeline(pipeline, BsonDocumentSerializer.Instance, serializationDomain, translationOptions);
6362

6463
var operation = new ChangeStreamOperation<TResult>(
@@ -83,9 +82,9 @@ public static ChangeStreamOperation<TResult> CreateChangeStreamOperation<TResult
8382
ReadConcern readConcern,
8483
MessageEncoderSettings messageEncoderSettings,
8584
bool retryRequested,
86-
ExpressionTranslationOptions translationOptions)
85+
ExpressionTranslationOptions translationOptions,
86+
IBsonSerializationDomain serializationDomain)
8787
{
88-
var serializationDomain = messageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null);
8988
var renderedPipeline = RenderPipeline(pipeline, documentSerializer, serializationDomain, translationOptions);
9089

9190
var operation = new ChangeStreamOperation<TResult>(

‎src/MongoDB.Driver/Core/Operations/ChangeStreamOperation.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ public ChangeStreamOperation(
7070
_serializationDomain = Ensure.IsNotNull(serializationDomain, nameof(serializationDomain));
7171
}
7272

73-
public ChangeStreamOperation(
74-
IEnumerable<BsonDocument> pipeline,
75-
IBsonSerializer<TResult> resultSerializer,
76-
MessageEncoderSettings messageEncoderSettings)
77-
: this(pipeline, resultSerializer, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain)
78-
{
79-
}
80-
8173
//EXIT
8274
public ChangeStreamOperation(
8375
DatabaseNamespace databaseNamespace,

‎src/MongoDB.Driver/Core/Operations/ListCollectionsOperation.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public ListCollectionsOperation(
5252
public ListCollectionsOperation(
5353
DatabaseNamespace databaseNamespace,
5454
MessageEncoderSettings messageEncoderSettings)
55+
:this(databaseNamespace, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain)
5556
{
5657
}
5758

‎src/MongoDB.Driver/MongoClient.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,8 @@ private ChangeStreamOperation<TResult> CreateChangeStreamOperation<TResult>(
563563
_settings.ReadConcern,
564564
GetMessageEncoderSettings(),
565565
_settings.RetryReads,
566-
_settings.TranslationOptions);
566+
_settings.TranslationOptions,
567+
_settings.SerializationDomain);
567568

568569
private TResult ExecuteReadOperation<TResult>(IClientSessionHandle session, IReadOperation<TResult> operation, CancellationToken cancellationToken)
569570
=> _operationExecutor.ExecuteReadOperation(session, operation, _readOperationOptions, false, cancellationToken);

‎src/MongoDB.Driver/MongoCollectionImpl.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,8 @@ private ChangeStreamOperation<TResult> CreateChangeStreamOperation<TResult>(
866866
options,
867867
_settings.ReadConcern, messageEncoderSettings: _messageEncoderSettings,
868868
_database.Client.Settings.RetryReads,
869-
translationOptions);
869+
translationOptions,
870+
_settings.SerializationDomain);
870871
}
871872

872873
private CountDocumentsOperation CreateCountDocumentsOperation(

‎src/MongoDB.Driver/MongoDatabase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,8 @@ private ChangeStreamOperation<TResult> CreateChangeStreamOperation<TResult>(
760760
_settings.ReadConcern,
761761
GetMessageEncoderSettings(),
762762
_client.Settings.RetryReads,
763-
translationOptions);
763+
translationOptions,
764+
_client.Settings.SerializationDomain);
764765
}
765766

766767
private TResult ExecuteReadOperation<TResult>(IClientSessionHandle session, IReadOperation<TResult> operation, CancellationToken cancellationToken)

‎tests/MongoDB.Driver.Tests/ChangeStreamHelperTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void CreateChangeStreamOperation_for_client_returns_expected_result()
4545
var messageEncoderSettings = new MessageEncoderSettings();
4646
var renderedPipeline = RenderPipeline(pipeline);
4747

48-
var result = ChangeStreamHelper.CreateChangeStreamOperation(pipeline, options, readConcern, messageEncoderSettings, retryRequested: true, translationOptions: null);
48+
var result = ChangeStreamHelper.CreateChangeStreamOperation(pipeline, options, readConcern, messageEncoderSettings, retryRequested: true, translationOptions: null, BsonSerializer.DefaultSerializationDomain);
4949

5050
result.BatchSize.Should().Be(options.BatchSize);
5151
result.Collation.Should().BeSameAs(options.Collation);
@@ -86,7 +86,7 @@ public void CreateChangeStreamOperation_for_database_returns_expected_result()
8686
var messageEncoderSettings = new MessageEncoderSettings();
8787
var renderedPipeline = RenderPipeline(pipeline);
8888

89-
var result = ChangeStreamHelper.CreateChangeStreamOperation(mockDatabase.Object, pipeline, options, readConcern, messageEncoderSettings, retryRequested: true, translationOptions: null);
89+
var result = ChangeStreamHelper.CreateChangeStreamOperation(mockDatabase.Object, pipeline, options, readConcern, messageEncoderSettings, retryRequested: true, translationOptions: null, BsonSerializer.DefaultSerializationDomain);
9090

9191
result.BatchSize.Should().Be(options.BatchSize);
9292
result.Collation.Should().BeSameAs(options.Collation);
@@ -129,7 +129,7 @@ public void CreateChangeStreamOperation_for_collection_returns_expected_result()
129129
var messageEncoderSettings = new MessageEncoderSettings();
130130
var renderedPipeline = RenderPipeline(pipeline);
131131

132-
var result = ChangeStreamHelper.CreateChangeStreamOperation(mockCollection.Object, pipeline, documentSerializer, options, readConcern, messageEncoderSettings, retryRequested: true, translationOptions: null);
132+
var result = ChangeStreamHelper.CreateChangeStreamOperation(mockCollection.Object, pipeline, documentSerializer, options, readConcern, messageEncoderSettings, retryRequested: true, translationOptions: null, BsonSerializer.DefaultSerializationDomain);
133133

134134
result.BatchSize.Should().Be(options.BatchSize);
135135
result.Collation.Should().BeSameAs(options.Collation);

‎tests/MongoDB.Driver.Tests/Core/Operations/ReadCommandOperationTests.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ public void Execute_should_call_channel_Command_with_unwrapped_command_when_wrap
107107
null, // postWriteAction
108108
CommandResponseHandling.Return,
109109
subject.ResultSerializer,
110-
subject.MessageEncoderSettings),
110+
subject.MessageEncoderSettings,
111+
It.IsAny<IBsonSerializationDomain>()),
111112
Times.Once);
112113
}
113114
else
@@ -125,7 +126,8 @@ public void Execute_should_call_channel_Command_with_unwrapped_command_when_wrap
125126
null, // postWriteAction
126127
CommandResponseHandling.Return,
127128
subject.ResultSerializer,
128-
subject.MessageEncoderSettings),
129+
subject.MessageEncoderSettings,
130+
It.IsAny<IBsonSerializationDomain>()),
129131
Times.Once);
130132
}
131133
}
@@ -161,7 +163,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_additi
161163
null, // postWriteAction
162164
CommandResponseHandling.Return,
163165
subject.ResultSerializer,
164-
subject.MessageEncoderSettings),
166+
subject.MessageEncoderSettings,
167+
It.IsAny<IBsonSerializationDomain>()),
165168
Times.Once);
166169
}
167170
else
@@ -179,7 +182,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_additi
179182
null, // postWriteAction
180183
CommandResponseHandling.Return,
181184
subject.ResultSerializer,
182-
subject.MessageEncoderSettings),
185+
subject.MessageEncoderSettings,
186+
It.IsAny<IBsonSerializationDomain>()),
183187
Times.Once);
184188
}
185189
}
@@ -214,7 +218,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_commen
214218
null, // postWriteAction
215219
CommandResponseHandling.Return,
216220
subject.ResultSerializer,
217-
subject.MessageEncoderSettings),
221+
subject.MessageEncoderSettings,
222+
It.IsAny<IBsonSerializationDomain>()),
218223
Times.Once);
219224
}
220225
else
@@ -232,7 +237,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_commen
232237
null, // postWriteAction
233238
CommandResponseHandling.Return,
234239
subject.ResultSerializer,
235-
subject.MessageEncoderSettings),
240+
subject.MessageEncoderSettings,
241+
It.IsAny<IBsonSerializationDomain>()),
236242
Times.Once);
237243
}
238244
}
@@ -268,7 +274,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_readPr
268274
null, // postWriteAction
269275
CommandResponseHandling.Return,
270276
subject.ResultSerializer,
271-
subject.MessageEncoderSettings),
277+
subject.MessageEncoderSettings,
278+
It.IsAny<IBsonSerializationDomain>()),
272279
Times.Once);
273280
}
274281
else
@@ -286,7 +293,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_readPr
286293
null, // postWriteAction
287294
CommandResponseHandling.Return,
288295
subject.ResultSerializer,
289-
subject.MessageEncoderSettings),
296+
subject.MessageEncoderSettings,
297+
It.IsAny<IBsonSerializationDomain>()),
290298
Times.Once);
291299
}
292300
}

‎tests/MongoDB.Driver.Tests/Core/Operations/WriteCommandOperationTests.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public void Execute_should_call_channel_Command_with_unwrapped_command_when_wrap
8181
null, // postWriteAction
8282
CommandResponseHandling.Return,
8383
subject.ResultSerializer,
84-
subject.MessageEncoderSettings),
84+
subject.MessageEncoderSettings,
85+
It.IsAny<IBsonSerializationDomain>()),
8586
Times.Once);
8687
}
8788
else
@@ -99,7 +100,8 @@ public void Execute_should_call_channel_Command_with_unwrapped_command_when_wrap
99100
null, // postWriteAction
100101
CommandResponseHandling.Return,
101102
subject.ResultSerializer,
102-
subject.MessageEncoderSettings),
103+
subject.MessageEncoderSettings,
104+
It.IsAny<IBsonSerializationDomain>()),
103105
Times.Once);
104106
}
105107
}
@@ -133,7 +135,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_additi
133135
null, // postWriteAction
134136
CommandResponseHandling.Return,
135137
subject.ResultSerializer,
136-
subject.MessageEncoderSettings),
138+
subject.MessageEncoderSettings,
139+
It.IsAny<IBsonSerializationDomain>()),
137140
Times.Once);
138141
}
139142
else
@@ -151,7 +154,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_additi
151154
null, // postWriteAction
152155
CommandResponseHandling.Return,
153156
subject.ResultSerializer,
154-
subject.MessageEncoderSettings),
157+
subject.MessageEncoderSettings,
158+
It.IsAny<IBsonSerializationDomain>()),
155159
Times.Once);
156160
}
157161
}
@@ -185,7 +189,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_commen
185189
null, // postWriteAction
186190
CommandResponseHandling.Return,
187191
subject.ResultSerializer,
188-
subject.MessageEncoderSettings),
192+
subject.MessageEncoderSettings,
193+
It.IsAny<IBsonSerializationDomain>()),
189194
Times.Once);
190195
}
191196
else
@@ -203,7 +208,8 @@ public void Execute_should_call_channel_Command_with_wrapped_command_when_commen
203208
null, // postWriteAction
204209
CommandResponseHandling.Return,
205210
subject.ResultSerializer,
206-
subject.MessageEncoderSettings),
211+
subject.MessageEncoderSettings,
212+
It.IsAny<IBsonSerializationDomain>()),
207213
Times.Once);
208214
}
209215
}

0 commit comments

Comments
 (0)