Allow cosmos tests to run in parallel v2

test/EFCore.Cosmos.FunctionalTests/ConfigPatternsCosmosTest.cs

@@ -21,7 +21,7 @@ public class ConfigPatternsCosmosTest(ConfigPatternsCosmosTest.CosmosFixture fix
     [ConditionalFact]
     public async Task Cosmos_client_instance_is_shared_between_contexts()
     {
-        await using var testDatabase = await CosmosTestStore.CreateInitializedAsync(DatabaseName);
+        await using var testDatabase = await CosmosTestStoreFactory.Instance.CreateInitializedAsync(DatabaseName);
         var options = CreateOptions(testDatabase);
 
         CosmosClient client;
@@ -38,7 +38,7 @@ public async Task Cosmos_client_instance_is_shared_between_contexts()
             Assert.Same(client, context.Database.GetCosmosClient());
         }
 
-        await using var testDatabase2 = await CosmosTestStore.CreateInitializedAsync(DatabaseName, o => o.Region(Regions.AustraliaCentral));
+        await using var testDatabase2 = await CosmosTestStoreFactory.Instance.CreateInitializedAsync(DatabaseName, o => o.Region(Regions.AustraliaCentral));
         options = CreateOptions(testDatabase2);
 
         using (var context = new CustomerContext(options))
@@ -52,13 +52,13 @@ public async Task Should_not_throw_if_specified_region_is_right()
     {
         var regionName = Regions.AustraliaCentral;
 
-        await using var testDatabase = await CosmosTestStore.CreateInitializedAsync(DatabaseName, o => o.Region(regionName));
+        await using var testDatabase = await CosmosTestStoreFactory.Instance.CreateInitializedAsync(DatabaseName, o => o.Region(regionName));
         var options = CreateOptions(testDatabase);
 
         var customer = new Customer { Id = 42, Name = "Theon" };
 
         using var context = new CustomerContext(options);
-        await context.Database.EnsureCreatedAsync();
+        await testDatabase.CreatedContainersAsync(context, true);
 
         await context.AddAsync(customer);
 
@@ -70,13 +70,13 @@ public async Task Should_throw_if_specified_region_is_wrong()
     {
         var exception = await Assert.ThrowsAsync<ArgumentException>(async () =>
         {
-            await using var testDatabase = await CosmosTestStore.CreateInitializedAsync(DatabaseName, o => o.Region("FakeRegion"));
+            await using var testDatabase = await CosmosTestStoreFactory.Instance.CreateInitializedAsync(DatabaseName, o => o.Region("FakeRegion"));
             var options = CreateOptions(testDatabase);
 
             var customer = new Customer { Id = 42, Name = "Theon" };
 
             using var context = new CustomerContext(options);
-            await context.Database.EnsureCreatedAsync();
+            await testDatabase.CreatedContainersAsync(context, true);
 
             await context.AddAsync(customer);
 
@@ -94,13 +94,13 @@ public async Task Should_throw_if_specified_region_is_wrong()
         SkipReason = "Test is very environment-dependent; when running the Cosmos emulator in a VM on Mac, ConnectionMode.Direct causes severe issues")]
     public async Task Should_not_throw_if_specified_connection_mode_is_right()
     {
-        await using var testDatabase = await CosmosTestStore.CreateInitializedAsync(DatabaseName, o => o.ConnectionMode(ConnectionMode.Direct));
+        await using var testDatabase = await CosmosTestStoreFactory.Instance.CreateInitializedAsync(DatabaseName, o => o.ConnectionMode(ConnectionMode.Direct));
         var options = CreateOptions(testDatabase);
 
         var customer = new Customer { Id = 42, Name = "Theon" };
 
         using var context = new CustomerContext(options);
-        await context.Database.EnsureCreatedAsync();
+        await testDatabase.CreatedContainersAsync(context, true);
 
         await context.AddAsync(customer);
 
@@ -112,14 +112,14 @@ public async Task Should_throw_if_specified_connection_mode_is_wrong()
     {
         var exception = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
         {
-            await using var testDatabase = await CosmosTestStore.CreateInitializedAsync(
+            await using var testDatabase = await CosmosTestStoreFactory.Instance.CreateInitializedAsync(
                 DatabaseName, o => o.ConnectionMode((ConnectionMode)123456));
             var options = CreateOptions(testDatabase);
 
             var customer = new Customer { Id = 42, Name = "Theon" };
 
             using var context = new CustomerContext(options);
-            await context.Database.EnsureCreatedAsync();
+            await testDatabase.CreatedContainersAsync(context, true);
 
             await context.AddAsync(customer);
 
@@ -130,7 +130,7 @@ public async Task Should_throw_if_specified_connection_mode_is_wrong()
     [ConditionalFact]
     public async Task Cosmos_client_instance_is_thread_safe()
     {
-        await using var testDatabase = await CosmosTestStore.CreateInitializedAsync(DatabaseName);
+        await using var testDatabase = await CosmosTestStoreFactory.Instance.CreateInitializedAsync(DatabaseName);
         var options = CreateOptions(testDatabase);
 
         var threadCount = Environment.ProcessorCount;

test/EFCore.Cosmos.FunctionalTests/ConnectionSpecificationTest.cs

@@ -13,7 +13,7 @@ public class ConnectionSpecificationTest
     [ConditionalFact]
     public async Task Can_specify_connection_string_in_OnConfiguring()
     {
-        await using var testDatabase = CosmosTestStore.Create("NonExisting");
+        await using var testDatabase = CosmosTestStoreFactory.Instance.Create("NonExisting");
         using var context = new BloggingContext(testDatabase);
         var creator = context.GetService<IDatabaseCreator>();