From 35c703f4e210244cbc06a9a6106ae8cc29a5be87 Mon Sep 17 00:00:00 2001
From: Oleksandr Poliakov <oleksandr.poliakov@mongodb.com>
Date: Wed, 29 Jan 2025 12:20:38 -0800
Subject: [PATCH] PR

---
 .../MongoClientFixture.cs                     | 47 ++++++++++---------
 .../MongoDatabaseFixture.cs                   |  4 +-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/tests/MongoDB.Driver.TestHelpers/MongoClientFixture.cs b/tests/MongoDB.Driver.TestHelpers/MongoClientFixture.cs
index 9f92c536ad..f0d4c904b0 100644
--- a/tests/MongoDB.Driver.TestHelpers/MongoClientFixture.cs
+++ b/tests/MongoDB.Driver.TestHelpers/MongoClientFixture.cs
@@ -18,37 +18,38 @@
 using MongoDB.Driver.Core.TestHelpers.Logging;
 using MongoDB.Driver.Tests;
 
-namespace MongoDB.Driver.TestHelpers;
-
-public class MongoClientFixture : IDisposable
+namespace MongoDB.Driver.TestHelpers
 {
-    private static readonly string[] __logCategoriesToExclude = ["MongoDB.Command", "MongoDB.Connection"];
+    public sealed class MongoClientFixture : IDisposable
+    {
+        private static readonly string[] __logCategoriesToExclude = ["MongoDB.Command", "MongoDB.Connection"];
 
-    private readonly Lazy<IMongoClient> _client;
+        private readonly Lazy<IMongoClient> _client;
 
-    public MongoClientFixture()
-    {
-        _client = new Lazy<IMongoClient>(CreateClient);
-        LogsAccumulator = new XUnitOutputAccumulator(__logCategoriesToExclude);
-    }
+        public MongoClientFixture()
+        {
+            _client = new Lazy<IMongoClient>(CreateClient);
+            LogsAccumulator = new XUnitOutputAccumulator(__logCategoriesToExclude);
+        }
 
-    public IMongoClient Client => _client.Value;
+        public IMongoClient Client => _client.Value;
 
-    internal XUnitOutputAccumulator LogsAccumulator { get; }
+        internal XUnitOutputAccumulator LogsAccumulator { get; }
 
-    private IMongoClient CreateClient()
-    {
-        var clientSettings = DriverTestConfiguration.GetClientSettings();
-        clientSettings.LoggingSettings = new LoggingSettings(new XUnitLoggerFactory(LogsAccumulator), 10000); // Spec test require larger truncation default
-        clientSettings.ClusterSource = DisposingClusterSource.Instance;
-        return new MongoClient(clientSettings);
-    }
+        private IMongoClient CreateClient()
+        {
+            var clientSettings = DriverTestConfiguration.GetClientSettings();
+            clientSettings.LoggingSettings = new LoggingSettings(new XUnitLoggerFactory(LogsAccumulator), 10000); // Spec test require larger truncation default
+            clientSettings.ClusterSource = DisposingClusterSource.Instance;
+            return new MongoClient(clientSettings);
+        }
 
-    public void Dispose()
-    {
-        if (_client.IsValueCreated)
+        public void Dispose()
         {
-            _client.Value.Dispose();
+            if (_client.IsValueCreated)
+            {
+                _client.Value.Dispose();
+            }
         }
     }
 }
diff --git a/tests/MongoDB.Driver.TestHelpers/MongoDatabaseFixture.cs b/tests/MongoDB.Driver.TestHelpers/MongoDatabaseFixture.cs
index 6d32c45524..da0262d78e 100644
--- a/tests/MongoDB.Driver.TestHelpers/MongoDatabaseFixture.cs
+++ b/tests/MongoDB.Driver.TestHelpers/MongoDatabaseFixture.cs
@@ -36,7 +36,7 @@ public MongoDatabaseFixture(MongoClientFixture clientFixture = null)
 
         public IMongoDatabase Database { get; private set; }
 
-        internal IMongoClient MongoClient => _mongoClientFixture.Client;
+        public IMongoClient MongoClient => _mongoClientFixture.Client;
 
         internal XUnitOutputAccumulator LogsAccumulator => _mongoClientFixture.LogsAccumulator;
 
@@ -69,7 +69,7 @@ public IMongoCollection<TDocument> CreateCollection<TDocument>(string collection
             return Database.GetCollection<TDocument>(collectionName);
         }
 
-        internal void Initialize()
+        public void Initialize()
         {
             if (Database == null)
             {