@@ -3,7 +3,6 @@ namespace NetEvolve.HealthChecks.Tests.Integration.GCP.Firestore;
33using System ;
44using System . Collections . Generic ;
55using System . Threading . Tasks ;
6- using global ::Google . Cloud . Firestore ;
76using Microsoft . Extensions . Configuration ;
87using Microsoft . Extensions . DependencyInjection ;
98using Microsoft . Extensions . Diagnostics . HealthChecks ;
@@ -23,23 +22,15 @@ public async Task AddFirestore_UseOptions_Healthy() =>
2322 await RunAndVerify (
2423 healthChecks => healthChecks . AddFirestore ( "TestContainerHealthy" , options => options . Timeout = 10000 ) ,
2524 HealthStatus . Healthy ,
26- serviceBuilder : services =>
27- {
28- Environment . SetEnvironmentVariable ( "FIRESTORE_EMULATOR_HOST" , _database . EmulatorHost ) ;
29- _ = services . AddSingleton ( _ => FirestoreDb . Create ( FirestoreDatabase . ProjectId ) ) ;
30- }
25+ serviceBuilder : services => _ = services . AddSingleton ( _ => _database . Database )
3126 ) ;
3227
3328 [ Test ]
3429 public async Task AddFirestore_UseOptions_Degraded ( ) =>
3530 await RunAndVerify (
3631 healthChecks => healthChecks . AddFirestore ( "TestContainerDegraded" , options => options . Timeout = 0 ) ,
3732 HealthStatus . Degraded ,
38- serviceBuilder : services =>
39- {
40- Environment . SetEnvironmentVariable ( "FIRESTORE_EMULATOR_HOST" , _database . EmulatorHost ) ;
41- _ = services . AddSingleton ( _ => FirestoreDb . Create ( FirestoreDatabase . ProjectId ) ) ;
42- }
33+ serviceBuilder : services => _ = services . AddSingleton ( _ => _database . Database )
4334 ) ;
4435
4536 [ Test ]
@@ -57,11 +48,7 @@ await RunAndVerify(
5748 ) ;
5849 } ,
5950 HealthStatus . Healthy ,
60- serviceBuilder : services =>
61- {
62- Environment . SetEnvironmentVariable ( "FIRESTORE_EMULATOR_HOST" , _database . EmulatorHost ) ;
63- _ = services . AddKeyedSingleton ( "firestore" , ( _ , _ ) => FirestoreDb . Create ( FirestoreDatabase . ProjectId ) ) ;
64- }
51+ serviceBuilder : services => _ = services . AddKeyedSingleton ( "firestore" , ( _ , _ ) => _database . Database )
6552 ) ;
6653
6754 [ Test ]
@@ -77,11 +64,7 @@ await RunAndVerify(
7764 } ;
7865 _ = config . AddInMemoryCollection ( values ) ;
7966 } ,
80- serviceBuilder : services =>
81- {
82- Environment . SetEnvironmentVariable ( "FIRESTORE_EMULATOR_HOST" , _database . EmulatorHost ) ;
83- _ = services . AddSingleton ( _ => FirestoreDb . Create ( FirestoreDatabase . ProjectId ) ) ;
84- }
67+ serviceBuilder : services => _ = services . AddSingleton ( _ => _database . Database )
8568 ) ;
8669
8770 [ Test ]
@@ -97,11 +80,7 @@ await RunAndVerify(
9780 } ;
9881 _ = config . AddInMemoryCollection ( values ) ;
9982 } ,
100- serviceBuilder : services =>
101- {
102- Environment . SetEnvironmentVariable ( "FIRESTORE_EMULATOR_HOST" , _database . EmulatorHost ) ;
103- _ = services . AddSingleton ( _ => FirestoreDb . Create ( FirestoreDatabase . ProjectId ) ) ;
104- }
83+ serviceBuilder : services => _ = services . AddSingleton ( _ => _database . Database )
10584 ) ;
10685
10786 [ Test ]
@@ -117,10 +96,6 @@ await RunAndVerify(
11796 } ;
11897 _ = config . AddInMemoryCollection ( values ) ;
11998 } ,
120- serviceBuilder : services =>
121- {
122- Environment . SetEnvironmentVariable ( "FIRESTORE_EMULATOR_HOST" , _database . EmulatorHost ) ;
123- _ = services . AddSingleton ( _ => FirestoreDb . Create ( FirestoreDatabase . ProjectId ) ) ;
124- }
99+ serviceBuilder : services => _ = services . AddSingleton ( _ => _database . Database )
125100 ) ;
126101}
0 commit comments