Skip to content

Commit b96210f

Browse files
committed
Fix tests
1 parent 4fdb03d commit b96210f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ private List<BsonElement> getExtraElements(final OperationContext operationConte
286286
throw new MongoClientException("Attempting to use a ClientSession while connected to a server that doesn't support "
287287
+ "sessions");
288288
}
289-
if (getSettings().isSessionSupported() && requireOpMsgResponse()) {
289+
if (getSettings().isSessionSupported() && responseExpected) {
290290
extraElements.add(new BsonElement("lsid", sessionContext.getSessionId()));
291291
}
292292
}

driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageSpecification.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class CommandMessageSpecification extends Specification {
172172
new BsonDocument('insert', new BsonString('coll')),
173173
new SplittablePayload(INSERT, [new BsonDocument('_id', new BsonInt32(1)),
174174
new BsonDocument('_id', new BsonInt32(2))]
175-
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) } ),
175+
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) }, true),
176176
],
177177
[
178178
LATEST_WIRE_VERSION,
@@ -193,7 +193,7 @@ class CommandMessageSpecification extends Specification {
193193
new BsonDocument('_id', new BsonInt32(3)).append('c', new BsonBinary(new byte[450])),
194194
new BsonDocument('_id', new BsonInt32(4)).append('b', new BsonBinary(new byte[441])),
195195
new BsonDocument('_id', new BsonInt32(5)).append('c', new BsonBinary(new byte[451]))]
196-
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) } )
196+
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) }, true)
197197
def message = new CommandMessage(namespace, insertCommand, fieldNameValidator, ReadPreference.primary(), messageSettings,
198198
false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE, null)
199199
def output = new BasicOutputBuffer()
@@ -280,7 +280,7 @@ class CommandMessageSpecification extends Specification {
280280
def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonBinary(new byte[900])),
281281
new BsonDocument('b', new BsonBinary(new byte[450])),
282282
new BsonDocument('c', new BsonBinary(new byte[450]))]
283-
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) } )
283+
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) }, true)
284284
def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
285285
false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE, null)
286286
def output = new BasicOutputBuffer()
@@ -328,7 +328,7 @@ class CommandMessageSpecification extends Specification {
328328
def messageSettings = MessageSettings.builder().maxDocumentSize(900)
329329
.maxWireVersion(LATEST_WIRE_VERSION).build()
330330
def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonBinary(new byte[900]))]
331-
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) })
331+
.withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) }, true)
332332
def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
333333
false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE, null)
334334
def output = new BasicOutputBuffer()
@@ -348,7 +348,7 @@ class CommandMessageSpecification extends Specification {
348348
given:
349349
def messageSettings = MessageSettings.builder().serverType(ServerType.SHARD_ROUTER)
350350
.maxWireVersion(FOUR_DOT_ZERO_WIRE_VERSION).build()
351-
def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonInt32(1))])
351+
def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonInt32(1))], true)
352352
def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
353353
false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE, null)
354354
def output = new BasicOutputBuffer()

driver-sync/src/test/unit/com/mongodb/client/internal/CryptConnectionSpecification.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class CryptConnectionSpecification extends Specification {
115115
def payload = new SplittablePayload(INSERT, [
116116
new BsonDocumentWrapper(new Document('_id', 1).append('ssid', '555-55-5555').append('b', bytes), codec),
117117
new BsonDocumentWrapper(new Document('_id', 2).append('ssid', '666-66-6666').append('b', bytes), codec)
118-
].withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) })
118+
].withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) }, true)
119119
def encryptedCommand = toRaw(new BsonDocument('insert', new BsonString('test')).append('documents', new BsonArray(
120120
[
121121
new BsonDocument('_id', new BsonInt32(1))
@@ -172,7 +172,7 @@ class CryptConnectionSpecification extends Specification {
172172
new BsonDocumentWrapper(new Document('_id', 1), codec),
173173
new BsonDocumentWrapper(new Document('_id', 2), codec),
174174
new BsonDocumentWrapper(new Document('_id', 3), codec)
175-
].withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) })
175+
].withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) }, true)
176176
def encryptedCommand = toRaw(new BsonDocument('insert', new BsonString('test')).append('documents', new BsonArray(
177177
[
178178
new BsonDocument('_id', new BsonInt32(1)),

0 commit comments

Comments
 (0)