Various test fixes

Author: papafe

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/MessageEncoderSettings.cs

@@ -41,7 +41,7 @@ internal static class MessageEncoderSettingsName
         public const string ShellVersion = nameof(ShellVersion);
 
         // other encoders (if any) might use additional settings
-        public const string SerializationDomain = nameof(SerializationDomain);
+        public const string SerializationDomain = nameof(SerializationDomain); //QUESTION Does this make sense? It was the easiest way to pass the serialization domain.
     }
 
     internal sealed class MessageEncoderSettings : IEnumerable<KeyValuePair<string, object>>

src/MongoDB.Driver/Linq/Linq3Implementation/MongoQueryProvider.cs

@@ -75,7 +75,7 @@ public MongoQueryProvider(
         {
             _collection = Ensure.IsNotNull(collection, nameof(collection));
             _pipelineInputSerializer = collection.DocumentSerializer;
-            _serializationDomain = collection.Settings.SerializationDomain;
+            _serializationDomain = collection.Settings?.SerializationDomain ?? BsonSerializer.DefaultSerializationDomain;
         }
 
         public MongoQueryProvider(

tests/MongoDB.Bson.Tests/Jira/CSharp310Tests.cs

@@ -44,8 +44,6 @@ public void Apply(BsonMemberMap memberMap)
                     memberMap.SetDefaultValue(Guid.Empty);
                 }
             }
-
-            public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) => Apply(memberMap);
         }
 
         private static void InitializeSerialization()

tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs

@@ -169,8 +169,6 @@ public void Apply(BsonMemberMap memberMap)
                 RunCount++;
                 RunOrder = _orderIndexProvider();
             }
-
-            public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) => Apply(memberMap);
         }
 
         private class TrackingAfterConvention : IPostProcessingConvention, ITrackRun
@@ -196,8 +194,6 @@ public void PostProcess(BsonClassMap classMap)
                 RunCount++;
                 RunOrder = _orderIndexProvider();
             }
-
-            public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain) => PostProcess(classMap);
         }
     }
 }

tests/MongoDB.Bson.Tests/Serialization/Conventions/StandardDiscriminatorConventionTests.cs

@@ -15,7 +15,6 @@
 
 using System;
 using FluentAssertions;
-using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Conventions;
 using Xunit;
 

tests/MongoDB.Driver.Tests/AggregateFluentTests.cs

@@ -1327,7 +1327,6 @@ private Mock<IMongoCollection<C>> CreateMockCollection(IMongoDatabase database =
             var collectionNamespace = new CollectionNamespace(databaseNamespace, collectionName);
 
             var settings = new MongoCollectionSettings();
-            settings.SerializationDomain = BsonSerializer.CreateSerializationDomain();
             var mockCollection = new Mock<IMongoCollection<C>>();
             mockCollection.SetupGet(c => c.CollectionNamespace).Returns(collectionNamespace);
             mockCollection.SetupGet(c => c.Database).Returns(database);

tests/MongoDB.Driver.Tests/FilterDefinitionBuilderNullableEnumComparedToNullableEnumWithStringRepresentationTests.cs

@@ -23,9 +23,7 @@ namespace MongoDB.Driver.Tests
 {
     public class FilterDefinitionBuilderNullableEnumComparedToNullableEnumWithStringRepresentationTests
     {
-        private static RenderArgs<C> __args = new(
-            BsonSerializer.DefaultSerializationDomain.SerializerRegistry.GetSerializer<C>(),
-            BsonSerializer.DefaultSerializationDomain);
+        private static RenderArgs<C> __args = new(BsonSerializer.SerializerRegistry.GetSerializer<C>(), BsonSerializer.SerializerRegistry);
         private static FilterDefinitionBuilder<C> __subject = Builders<C>.Filter;
 
         public enum E { A, B }

tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs

@@ -1044,8 +1044,8 @@ private void Assert<TDocument>(FilterDefinition<TDocument> filter, string expect
 
         private void Assert<TDocument>(FilterDefinition<TDocument> filter, BsonDocument expected)
         {
-            var documentSerializer = BsonSerializer.DefaultSerializationDomain.SerializerRegistry.GetSerializer<TDocument>();
-            var renderedFilter = filter.Render(new(documentSerializer,  BsonSerializer.DefaultSerializationDomain));
+            var documentSerializer = BsonSerializer.SerializerRegistry.GetSerializer<TDocument>();
+            var renderedFilter = filter.Render(new(documentSerializer, BsonSerializer.SerializerRegistry));
 
             renderedFilter.Should().Be(expected);
         }

tests/MongoDB.Driver.Tests/FindFluentTests.cs

@@ -357,7 +357,6 @@ private IFindFluent<Person, Person> CreateSubject(IClientSessionHandle session =
             mockDatabase.SetupGet(d => d.Client).Returns(mockClient.Object);
 
             var collectionSettings = new MongoCollectionSettings();
-            collectionSettings.SerializationDomain = BsonSerializer.CreateSerializationDomain();
             _mockCollection = new Mock<IMongoCollection<Person>>();
             _mockCollection.SetupGet(c => c.Database).Returns(mockDatabase.Object);
             _mockCollection.SetupGet(c => c.DocumentSerializer).Returns(BsonSerializer.SerializerRegistry.GetSerializer<Person>());

tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs

@@ -671,7 +671,6 @@ private IMongoCollection<T> CreateCollection<T>(string collectionName = null)
         {
             var database = CreateDatabase();
             var settings = new MongoCollectionSettings();
-            settings.SerializationDomain = BsonSerializer.CreateSerializationDomain();
             var mockCollection = new Mock<IMongoCollection<T>>();
             mockCollection.SetupGet(c => c.CollectionNamespace).Returns(new CollectionNamespace(new DatabaseNamespace("test"), collectionName ?? typeof(T).Name));
             mockCollection.SetupGet(c => c.Database).Returns(database);