Fix test dependency registrations (#933)

Co-authored-by: David Boike <david.boike@gmail.com>

Author: particularbot

src/NServiceBus.Storage.MongoDB.AcceptanceTests/When_custom_provider_registered.cs

@@ -18,7 +18,15 @@ public class When_custom_provider_registered : NServiceBusAcceptanceTest
     public async Task Should_be_used()
     {
         Context context = await Scenario.Define<Context>()
-            .WithEndpoint<EndpointWithCustomProvider>(b => b.When(session => session.SendLocal(new StartSaga1 { DataId = Guid.NewGuid() })))
+            .WithEndpoint<EndpointWithCustomProvider>(b =>
+            {
+                b.Services(c =>
+                    c.AddSingleton<IMongoClientProvider>(b => new CustomProvider(b.GetRequiredService<Context>())), afterStart: true);
+                b.When(session => session.SendLocal(new StartSaga1
+                {
+                    DataId = Guid.NewGuid()
+                }));
+            })
             .Done(c => c.SagaReceivedMessage)
             .Run();
 
@@ -34,11 +42,7 @@ public class Context : ScenarioContext
     public class EndpointWithCustomProvider : EndpointConfigurationBuilder
     {
         public EndpointWithCustomProvider() =>
-            EndpointSetup<DefaultServer>(config =>
-            {
-                config.RegisterComponents(c =>
-                    c.AddSingleton<IMongoClientProvider>(b => new CustomProvider(b.GetRequiredService<Context>())));
-            });
+            EndpointSetup<DefaultServer>();
 
         public class JustASaga(Context testContext) : Saga<JustASagaData>, IAmStartedByMessages<StartSaga1>
         {
@@ -53,30 +57,30 @@ public Task Handle(StartSaga1 message, IMessageHandlerContext context)
             protected override void ConfigureHowToFindSaga(SagaPropertyMapper<JustASagaData> mapper) => mapper.MapSaga(s => s.DataId).ToMessage<StartSaga1>(m => m.DataId);
         }
 
-        public class CustomProvider(Context testContext) : IMongoClientProvider
+        public class JustASagaData : ContainSagaData
+        {
+            public virtual Guid DataId { get; set; }
+        }
+    }
+
+    public class CustomProvider(Context testContext) : IMongoClientProvider
+    {
+        [field: AllowNull, MaybeNull]
+        public IMongoClient Client
         {
-            [field: AllowNull, MaybeNull]
-            public IMongoClient Client
+            get
             {
-                get
+                if (field is not null)
                 {
-                    if (field is not null)
-                    {
-                        return field;
-                    }
-
-                    var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
-
-                    field = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
-                    testContext.ProviderWasCalled = true;
                     return field;
                 }
-            }
-        }
 
-        public class JustASagaData : ContainSagaData
-        {
-            public virtual Guid DataId { get; set; }
+                var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
+
+                field = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
+                testContext.ProviderWasCalled = true;
+                return field;
+            }
         }
     }
 

src/NServiceBus.Storage.MongoDB.AcceptanceTests/When_using_outbox_synchronized_session_via_container.cs

@@ -14,7 +14,14 @@ public partial class When_using_outbox_synchronized_session_via_container : NSer
     public async Task Should_inject_synchronized_session_into_handler()
     {
         var context = await Scenario.Define<Context>()
-            .WithEndpoint<Endpoint>(b => b.When(s => s.SendLocal(new MyMessage())))
+            .WithEndpoint<Endpoint>(b =>
+            {
+                b.Services(c =>
+                {
+                    c.AddScoped<MyRepository>();
+                });
+                b.When(s => s.SendLocal(new MyMessage()));
+            })
             .Done(c => c.Done)
             .Run()
             .ConfigureAwait(false);
@@ -40,10 +47,6 @@ public Endpoint()
                 config.ConfigureTransport().TransportTransactionMode = TransportTransactionMode.ReceiveOnly;
 
                 config.EnableOutbox();
-                config.RegisterComponents(c =>
-                {
-                    c.AddScoped<MyRepository>();
-                });
             });
         }