- Fixing tests

Author: nhachicha

driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java

@@ -32,6 +32,7 @@
 import com.mongodb.internal.binding.AsyncConnectionSource;
 import com.mongodb.internal.connection.AsyncConnection;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.tracing.TracingManager;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -96,6 +97,7 @@ void setUp() {
 
         connectionSource = mock(AsyncConnectionSource.class);
         operationContext = mock(OperationContext.class);
+        when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP);
         timeoutContext = new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build()));
         serverDescription = mock(ServerDescription.class);

driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy

@@ -555,7 +555,7 @@ class MongoClientSettingsSpecification extends Specification {
                         'heartbeatConnectTimeoutMS', 'heartbeatSocketTimeoutMS', 'inetAddressResolver', 'loggerSettingsBuilder',
                         'readConcern', 'readPreference', 'retryReads',
                         'retryWrites', 'serverApi', 'serverSettingsBuilder', 'socketSettingsBuilder', 'sslSettingsBuilder',
-                        'timeoutMS', 'transportSettings', 'uuidRepresentation', 'writeConcern']
+                        'timeoutMS', 'tracingManager', 'transportSettings', 'uuidRepresentation', 'writeConcern']
 
         then:
         actual == expected
@@ -570,7 +570,7 @@ class MongoClientSettingsSpecification extends Specification {
                         'applyToSslSettings', 'autoEncryptionSettings', 'build', 'codecRegistry', 'commandListenerList',
                         'compressorList', 'contextProvider', 'credential', 'dnsClient', 'heartbeatConnectTimeoutMS',
                         'heartbeatSocketTimeoutMS', 'inetAddressResolver', 'readConcern', 'readPreference', 'retryReads', 'retryWrites',
-                        'serverApi', 'timeout', 'transportSettings', 'uuidRepresentation', 'writeConcern']
+                        'serverApi', 'timeout', 'tracer', 'transportSettings', 'uuidRepresentation', 'writeConcern']
 
         then:
         actual == expected

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

@@ -66,7 +66,8 @@ class LoggingCommandEventSenderSpecification extends Specification {
         }
         def operationContext = OPERATION_CONTEXT
         def sender = new LoggingCommandEventSender([] as Set, [] as Set, connectionDescription, commandListener,
-                operationContext, message, bsonOutput, new StructuredLogger(logger), LoggerSettings.builder().build())
+                operationContext, message, message.getCommandDocument(bsonOutput),
+                new StructuredLogger(logger), LoggerSettings.builder().build())
 
         when:
         sender.sendStartedEvent()
@@ -111,7 +112,7 @@ class LoggingCommandEventSenderSpecification extends Specification {
         }
         def operationContext = OPERATION_CONTEXT
         def sender = new LoggingCommandEventSender([] as Set, [] as Set, connectionDescription, commandListener,
-                operationContext, message, bsonOutput, new StructuredLogger(logger),
+                operationContext, message, message.getCommandDocument(bsonOutput), new StructuredLogger(logger),
                 LoggerSettings.builder().build())
         when:
         sender.sendStartedEvent()
@@ -169,7 +170,7 @@ class LoggingCommandEventSenderSpecification extends Specification {
         def operationContext = OPERATION_CONTEXT
 
         def sender = new LoggingCommandEventSender([] as Set, [] as Set, connectionDescription, null, operationContext,
-                message, bsonOutput, new StructuredLogger(logger), LoggerSettings.builder().build())
+                message, message.getCommandDocument(bsonOutput), new StructuredLogger(logger), LoggerSettings.builder().build())
 
         when:
         sender.sendStartedEvent()
@@ -202,7 +203,8 @@ class LoggingCommandEventSenderSpecification extends Specification {
         }
         def operationContext = OPERATION_CONTEXT
         def sender = new LoggingCommandEventSender(['createUser'] as Set, [] as Set, connectionDescription, null,
-                operationContext, message, bsonOutput, new StructuredLogger(logger), LoggerSettings.builder().build())
+                operationContext, message, message.getCommandDocument(bsonOutput), new StructuredLogger(logger),
+                LoggerSettings.builder().build())
 
         when:
         sender.sendStartedEvent()

driver-core/src/test/unit/com/mongodb/internal/operation/AsyncChangeStreamBatchCursorSpecification.groovy

@@ -22,6 +22,7 @@ import com.mongodb.internal.TimeoutContext
 import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncReadBinding
 import com.mongodb.internal.connection.OperationContext
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.Document
 import spock.lang.Specification
 
@@ -34,6 +35,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
         def operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Mock(TimeoutContext)
         binding.getOperationContext() >> operationContext
         operationContext.getTimeoutContext() >> timeoutContext
@@ -78,6 +80,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
         def operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Mock(TimeoutContext)
         binding.getOperationContext() >> operationContext
         operationContext.getTimeoutContext() >> timeoutContext
@@ -111,6 +114,7 @@ class AsyncChangeStreamBatchCursorSpecification extends Specification {
         def changeStreamOpertation = Stub(ChangeStreamOperation)
         def binding = Mock(AsyncReadBinding)
         def operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Mock(TimeoutContext)
         binding.getOperationContext() >> operationContext
         operationContext.getTimeoutContext() >> timeoutContext

driver-core/src/test/unit/com/mongodb/internal/operation/AsyncCommandBatchCursorSpecification.groovy

@@ -35,6 +35,7 @@ import com.mongodb.internal.async.SingleResultCallback
 import com.mongodb.internal.binding.AsyncConnectionSource
 import com.mongodb.internal.connection.AsyncConnection
 import com.mongodb.internal.connection.OperationContext
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -50,6 +51,7 @@ import static OperationUnitSpecification.getMaxWireVersionForServerVersion
 import static com.mongodb.ReadPreference.primary
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CLOSED_AS_CURSOR
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CONCURRENT_OPERATION
+import static org.mockito.Mockito.when
 
 class AsyncCommandBatchCursorSpecification extends Specification {
 
@@ -524,6 +526,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
                     .build()
         }
         OperationContext operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
         operationContext.getTimeoutContext() >> timeoutContext

driver-core/src/test/unit/com/mongodb/internal/operation/ChangeStreamBatchCursorTest.java

@@ -25,6 +25,7 @@
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.tracing.TracingManager;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.Document;
@@ -296,6 +297,7 @@ void setUp() {
         doNothing().when(timeoutContext).resetTimeoutIfPresent();
 
         operationContext = mock(OperationContext.class);
+        when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP);
         when(operationContext.getTimeoutContext()).thenReturn(timeoutContext);
         connection = mock(Connection.class);
         when(connection.command(any(), any(), any(), any(), any(), any())).thenReturn(null);

driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorSpecification.groovy

@@ -35,6 +35,7 @@ import com.mongodb.internal.TimeoutSettings
 import com.mongodb.internal.binding.ConnectionSource
 import com.mongodb.internal.connection.Connection
 import com.mongodb.internal.connection.OperationContext
+import com.mongodb.internal.tracing.TracingManager
 import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -574,6 +575,7 @@ class CommandBatchCursorSpecification extends Specification {
                     .build()
         }
         OperationContext operationContext = Mock(OperationContext)
+        operationContext.getTracingManager() >> TracingManager.NO_OP
         def timeoutContext = Spy(new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(3, TimeUnit.SECONDS).build())))
         operationContext.getTimeoutContext() >> timeoutContext

driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java

@@ -31,6 +31,7 @@
 import com.mongodb.internal.binding.ConnectionSource;
 import com.mongodb.internal.connection.Connection;
 import com.mongodb.internal.connection.OperationContext;
+import com.mongodb.internal.tracing.TracingManager;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -94,6 +95,8 @@ void setUp() {
 
         connectionSource = mock(ConnectionSource.class);
         operationContext = mock(OperationContext.class);
+        when(operationContext.getTracingManager()).thenReturn(TracingManager.NO_OP);
+
         timeoutContext = new TimeoutContext(TimeoutSettings.create(
                 MongoClientSettings.builder().timeout(TIMEOUT.toMillis(), MILLISECONDS).build()));
         serverDescription = mock(ServerDescription.class);

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

@@ -258,6 +258,7 @@ class MongoClusterSpecification extends Specification {
     MongoClusterImpl createMongoCluster(final MongoClientSettings settings, final OperationExecutor operationExecutor) {
         new MongoClusterImpl(null, cluster, settings.codecRegistry, null, null,
                 originator, operationExecutor, settings.readConcern, settings.readPreference, settings.retryReads, settings.retryWrites,
-                null, serverSessionPool, TimeoutSettings.create(settings), settings.uuidRepresentation, settings.writeConcern)
+                null, serverSessionPool, TimeoutSettings.create(settings), settings.uuidRepresentation,
+                settings.writeConcern, settings.tracingManager)
     }
 }