Skip to content

Commit

Permalink
PR
Browse files Browse the repository at this point in the history
  • Loading branch information
Oleksandr Poliakov committed Jan 29, 2025
1 parent 57ecace commit 35c703f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 25 deletions.
47 changes: 24 additions & 23 deletions tests/MongoDB.Driver.TestHelpers/MongoClientFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
}
4 changes: 2 additions & 2 deletions tests/MongoDB.Driver.TestHelpers/MongoDatabaseFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 35c703f

Please sign in to comment.