Isolating more troublesome tests in the stress tests project

src/CoreTests/CoreTests.csproj

@@ -114,6 +114,12 @@
         <Compile Include="..\Marten.Testing\Harness\TestsSettings.cs">
             <Link>Harness\TestsSettings.cs</Link>
         </Compile>
+        <Compile Include="..\Marten.Testing\MartenHostEnvironment.cs">
+          <Link>MartenHostEnvironment.cs</Link>
+        </Compile>
+        <Compile Include="..\Marten.Testing\RecordingLogger.cs">
+          <Link>RecordingLogger.cs</Link>
+        </Compile>
         <Compile Include="..\Marten.Testing\SchemaMigrationExtensions.cs">
             <Link>SchemaMigrationExtensions.cs</Link>
         </Compile>

src/CoreTests/MartenServiceCollectionExtensionsTests.cs

@@ -10,6 +10,7 @@
 using Marten.Internal.Sessions;
 using Marten.Services;
 using Marten.Sessions;
+using Marten.Testing;
 using Marten.Testing.Documents;
 using Marten.Testing.Harness;
 using Microsoft.Extensions.DependencyInjection;

src/CoreTests/request_count_tracking.cs

@@ -1,9 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Marten;
 using Marten.Exceptions;
-using Marten.Services;
+using Marten.Testing;
 using Marten.Testing.Harness;
 using Npgsql;
 using Shouldly;
@@ -124,59 +123,3 @@ public async Task log_execute_success_2_async()
         logger.LastCommand.ShouldBeSameAs(cmd);
     }
 }
-
-public class RecordingLogger: IMartenSessionLogger
-{
-    public NpgsqlCommand LastCommand;
-    public Exception LastException;
-    public readonly IList<IChangeSet> Commits = new List<IChangeSet>();
-    public IChangeSet LastCommit { get; set; }
-
-    public IDocumentSession LastSession { get; set; }
-
-    public int OnBeforeExecuted { get; set; }
-
-    public void LogFailure(NpgsqlBatch batch, Exception ex)
-    {
-
-    }
-
-    public void LogFailure(Exception ex, string message)
-    {
-
-    }
-
-    public void RecordSavedChanges(IDocumentSession session, IChangeSet commit)
-    {
-        LastSession = session;
-        LastCommit = commit.Clone();
-
-        Commits.Add(commit);
-    }
-
-    public void OnBeforeExecute(NpgsqlCommand command)
-    {
-        OnBeforeExecuted++;
-    }
-
-    public void OnBeforeExecute(NpgsqlBatch batch)
-    {
-
-    }
-
-    public void LogSuccess(NpgsqlCommand command)
-    {
-        LastCommand = command;
-    }
-
-    public void LogFailure(NpgsqlCommand command, Exception ex)
-    {
-        LastCommand = command;
-        LastException = ex;
-    }
-
-    public void LogSuccess(NpgsqlBatch batch)
-    {
-
-    }
-}

src/Marten.Testing/Marten.Testing.csproj

@@ -21,6 +21,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
         <PackageReference Include="Jil" Version="3.0.0-alpha2" />

src/CoreTests/MartenHostEnvironment.cs → src/Marten.Testing/MartenHostEnvironment.cs

@@ -3,7 +3,7 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 
-namespace CoreTests;
+namespace Marten.Testing;
 
 internal class MartenHostEnvironment : IHostEnvironment
 {

src/Marten.Testing/RecordingLogger.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using Marten.Services;
+using Npgsql;
+
+namespace Marten.Testing;
+
+public class RecordingLogger: IMartenSessionLogger
+{
+    public NpgsqlCommand LastCommand;
+    public Exception LastException;
+    public readonly IList<IChangeSet> Commits = new List<IChangeSet>();
+    public IChangeSet LastCommit { get; set; }
+
+    public IDocumentSession LastSession { get; set; }
+
+    public int OnBeforeExecuted { get; set; }
+
+    public void LogFailure(NpgsqlBatch batch, Exception ex)
+    {
+
+    }
+
+    public void LogFailure(Exception ex, string message)
+    {
+
+    }
+
+    public void RecordSavedChanges(IDocumentSession session, IChangeSet commit)
+    {
+        LastSession = session;
+        LastCommit = commit.Clone();
+
+        Commits.Add(commit);
+    }
+
+    public void OnBeforeExecute(NpgsqlCommand command)
+    {
+        OnBeforeExecuted++;
+    }
+
+    public void OnBeforeExecute(NpgsqlBatch batch)
+    {
+
+    }
+
+    public void LogSuccess(NpgsqlCommand command)
+    {
+        LastCommand = command;
+    }
+
+    public void LogFailure(NpgsqlCommand command, Exception ex)
+    {
+        LastCommand = command;
+        LastException = ex;
+    }
+
+    public void LogSuccess(NpgsqlBatch batch)
+    {
+
+    }
+}

src/StressTests/StressTests.csproj

@@ -29,6 +29,15 @@
         <PackageReference Include="Shouldly" Version="4.2.1" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Include="..\Marten.Testing\MartenHostEnvironment.cs">
+        <Link>MartenHostEnvironment.cs</Link>
+      </Compile>
+      <Compile Include="..\Marten.Testing\RecordingLogger.cs">
+        <Link>RecordingLogger.cs</Link>
+      </Compile>
+    </ItemGroup>
+
     <PropertyGroup>
         <NoWarn>xUnit1013</NoWarn>
     </PropertyGroup>

src/StressTests/using_multiple_document_stores_in_same_host.cs

@@ -11,6 +11,7 @@
 using Marten.Events.Daemon.Resiliency;
 using Marten.Internal;
 using Marten.Services;
+using Marten.Testing;
 using Marten.Testing.Documents;
 using Marten.Testing.Harness;
 using Microsoft.Extensions.DependencyInjection;
@@ -46,7 +47,7 @@ public using_multiple_document_stores_in_same_host()
             });
 
             // Just to prove that this doesn't blow up, see GH-2892
-            services.AddKeyedSingleton<IMartenSessionLogger>("blue", new StoreOptionsTests.RecordingLogger());
+            services.AddKeyedSingleton<IMartenSessionLogger>("blue", new RecordingLogger());
 
             services.AddMartenStore<ISecondStore>(services =>
             {