fix: Add missing package references for unit tests and simplify Firestore container setup

Author: samtrion

tests/NetEvolve.HealthChecks.Tests.Integration/GCP/Firestore/FirestoreDatabase.cs

@@ -1,25 +1,47 @@
 namespace NetEvolve.HealthChecks.Tests.Integration.GCP.Firestore;
 
+using System;
 using System.Threading.Tasks;
-using DotNet.Testcontainers.Builders;
+using global::Google.Cloud.Firestore;
+using global::Google.Cloud.Firestore.V1;
+using global::Grpc.Core;
 using Microsoft.Extensions.Logging.Abstractions;
 using Testcontainers.Firestore;
 using TUnit.Core.Interfaces;
 
 public sealed class FirestoreDatabase : IAsyncInitializer, IAsyncDisposable
 {
-    private readonly FirestoreContainer _database = new FirestoreBuilder()
-        .WithLogger(NullLogger.Instance)
-        .WithWaitStrategy(
-            Wait.ForUnixContainer().UntilHttpRequestIsSucceeded(request => request.ForPath("/").ForPort(8080))
-        )
-        .Build();
+    private readonly FirestoreContainer _container = new FirestoreBuilder().WithLogger(NullLogger.Instance).Build();
 
-    public string ProjectId => "test-project";
+    private FirestoreClient? _client;
+    private FirestoreDb? _database;
 
-    public string EmulatorHost => _database.GetEmulatorEndpoint();
+    public const string ProjectId = "test-project";
 
-    public async ValueTask DisposeAsync() => await _database.DisposeAsync().ConfigureAwait(false);
+    public FirestoreDb Database => _database ?? throw new InvalidOperationException("Database not initialized");
 
-    public async Task InitializeAsync() => await _database.StartAsync().ConfigureAwait(false);
+    public async ValueTask DisposeAsync()
+    {
+        await _container.DisposeAsync().ConfigureAwait(false);
+    }
+
+    public async Task InitializeAsync()
+    {
+        await _container.StartAsync().ConfigureAwait(false);
+
+        // Parse endpoint to get host:port
+        var fullEndpoint = _container.GetEmulatorEndpoint();
+        var uri = new Uri(fullEndpoint);
+        var hostPort = $"{uri.Host}:{uri.Port}";
+
+        // Create Firestore client configured for emulator
+        var clientBuilder = new FirestoreClientBuilder
+        {
+            Endpoint = hostPort,
+            ChannelCredentials = ChannelCredentials.Insecure,
+        };
+
+        _client = await clientBuilder.BuildAsync().ConfigureAwait(false);
+        _database = await FirestoreDb.CreateAsync(ProjectId, _client).ConfigureAwait(false);
+    }
 }

tests/NetEvolve.HealthChecks.Tests.Integration/GCP/Firestore/FirestoreHealthCheckTests.cs

@@ -3,7 +3,6 @@ namespace NetEvolve.HealthChecks.Tests.Integration.GCP.Firestore;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using global::Google.Cloud.Firestore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
@@ -23,23 +22,15 @@ public async Task AddFirestore_UseOptions_Healthy() =>
         await RunAndVerify(
             healthChecks => healthChecks.AddFirestore("TestContainerHealthy", options => options.Timeout = 10000),
             HealthStatus.Healthy,
-            serviceBuilder: services =>
-            {
-                Environment.SetEnvironmentVariable("FIRESTORE_EMULATOR_HOST", _database.EmulatorHost);
-                _ = services.AddSingleton(_ => FirestoreDb.Create(_database.ProjectId));
-            }
+            serviceBuilder: services => _ = services.AddSingleton(_ => _database.Database)
         );
 
     [Test]
     public async Task AddFirestore_UseOptions_Degraded() =>
         await RunAndVerify(
             healthChecks => healthChecks.AddFirestore("TestContainerDegraded", options => options.Timeout = 0),
             HealthStatus.Degraded,
-            serviceBuilder: services =>
-            {
-                Environment.SetEnvironmentVariable("FIRESTORE_EMULATOR_HOST", _database.EmulatorHost);
-                _ = services.AddSingleton(_ => FirestoreDb.Create(_database.ProjectId));
-            }
+            serviceBuilder: services => _ = services.AddSingleton(_ => _database.Database)
         );
 
     [Test]
@@ -57,11 +48,7 @@ await RunAndVerify(
                 );
             },
             HealthStatus.Healthy,
-            serviceBuilder: services =>
-            {
-                Environment.SetEnvironmentVariable("FIRESTORE_EMULATOR_HOST", _database.EmulatorHost);
-                _ = services.AddKeyedSingleton("firestore", (_, _) => FirestoreDb.Create(_database.ProjectId));
-            }
+            serviceBuilder: services => _ = services.AddKeyedSingleton("firestore", (_, _) => _database.Database)
         );
 
     [Test]
@@ -77,11 +64,7 @@ await RunAndVerify(
                 };
                 _ = config.AddInMemoryCollection(values);
             },
-            serviceBuilder: services =>
-            {
-                Environment.SetEnvironmentVariable("FIRESTORE_EMULATOR_HOST", _database.EmulatorHost);
-                _ = services.AddSingleton(_ => FirestoreDb.Create(_database.ProjectId));
-            }
+            serviceBuilder: services => _ = services.AddSingleton(_ => _database.Database)
         );
 
     [Test]
@@ -97,11 +80,7 @@ await RunAndVerify(
                 };
                 _ = config.AddInMemoryCollection(values);
             },
-            serviceBuilder: services =>
-            {
-                Environment.SetEnvironmentVariable("FIRESTORE_EMULATOR_HOST", _database.EmulatorHost);
-                _ = services.AddSingleton(_ => FirestoreDb.Create(_database.ProjectId));
-            }
+            serviceBuilder: services => _ = services.AddSingleton(_ => _database.Database)
         );
 
     [Test]
@@ -117,10 +96,6 @@ await RunAndVerify(
                 };
                 _ = config.AddInMemoryCollection(values);
             },
-            serviceBuilder: services =>
-            {
-                Environment.SetEnvironmentVariable("FIRESTORE_EMULATOR_HOST", _database.EmulatorHost);
-                _ = services.AddSingleton(_ => FirestoreDb.Create(_database.ProjectId));
-            }
+            serviceBuilder: services => _ = services.AddSingleton(_ => _database.Database)
         );
 }

tests/NetEvolve.HealthChecks.Tests.Unit/NetEvolve.HealthChecks.Tests.Unit.csproj

@@ -10,6 +10,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="coverlet.msbuild" />
+    <PackageReference Include="Google.Cloud.Firestore" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <PackageReference Include="NetEvolve.Extensions.TUnit" />
     <PackageReference Include="NSubstitute" />
@@ -41,6 +42,7 @@
     <ProjectReference Include="..\..\src\NetEvolve.HealthChecks.DuckDB\NetEvolve.HealthChecks.DuckDB.csproj" />
     <ProjectReference Include="..\..\src\NetEvolve.HealthChecks.Elasticsearch\NetEvolve.HealthChecks.Elasticsearch.csproj" />
     <ProjectReference Include="..\..\src\NetEvolve.HealthChecks.Firebird\NetEvolve.HealthChecks.Firebird.csproj" />
+    <ProjectReference Include="..\..\src\NetEvolve.HealthChecks.GCP.Firestore\NetEvolve.HealthChecks.GCP.Firestore.csproj" />
     <ProjectReference Include="..\..\src\NetEvolve.HealthChecks.Http\NetEvolve.HealthChecks.Http.csproj" />
     <ProjectReference Include="..\..\src\NetEvolve.HealthChecks.Keycloak\NetEvolve.HealthChecks.Keycloak.csproj" />
     <ProjectReference Include="..\..\src\NetEvolve.HealthChecks.LiteDB\NetEvolve.HealthChecks.LiteDB.csproj" />