Test fixes

Author: DavidBoike

src/AcceptanceTestHelper/RuntimeSagaDefinitionReader.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using NServiceBus;
 using NServiceBus.Persistence.Sql.ScriptBuilder;
 using NServiceBus.Sagas;
 using NServiceBus.Settings;
@@ -22,10 +23,11 @@ public static IEnumerable<SagaDefinition> GetSagaDefinitions(IReadOnlySettings s
         return sagaMetadataCollection.Select(metadata => GetSagaDefinition(metadata.SagaType, sagaDefinitions, sqlDialect));
     }
 
-    public static SagaDefinition GetSagaDefinition(Type sagaType, BuildSqlDialect sqlDialect)
+    public static SagaDefinition GetSagaDefinition<TSagaType>(BuildSqlDialect sqlDialect)
+        where TSagaType : Saga
     {
-        var sagaDefinitions = GetSagaDefinitions([sagaType.Assembly]);
-        var metadata = SagaMetadata.Create(sagaType);
+        var sagaDefinitions = GetSagaDefinitions([typeof(TSagaType).Assembly]);
+        var metadata = SagaMetadata.Create<TSagaType>();
 
         return GetSagaDefinition(metadata.SagaType, sagaDefinitions, sqlDialect);
     }

src/MsSqlMicrosoftDataClientAcceptanceTests/When_transitioning_correlation_property.cs

@@ -16,9 +16,9 @@ public class When_transitioning_correlation_property : NServiceBusAcceptanceTest
     public async Task Should_remove_old_property_after_phase_three()
     {
         var dialect = BuildSqlDialect.MsSqlServer;
-        var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase1Saga), dialect);
-        var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase2Saga), dialect);
-        var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase3Saga), dialect);
+        var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase1Saga>(dialect);
+        var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase2Saga>(dialect);
+        var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase3Saga>(dialect);
 
         using (var connection = MsSqlMicrosoftDataClientConnectionBuilder.Build())
         {

src/MsSqlMicrosoftDataClientAcceptanceTests/When_using_multi_tenant.cs

@@ -105,7 +105,7 @@ async Task RunTest<TEndpointType>(bool useOutbox)
                 });
             })
             .Done(c => c.TenantADbName != null && c.TenantBDbName != null)
-            .Run(TimeSpan.FromSeconds(30));
+            .Run();
 
         Assert.Multiple(() =>
         {
@@ -145,7 +145,7 @@ public async Task Use_multiple_tenant_headers()
                 });
             })
             .Done(c => c.TenantADbName != null && c.TenantBDbName != null)
-            .Run(TimeSpan.FromSeconds(30));
+            .Run();
 
         Assert.Multiple(() =>
         {

src/MySqlAcceptanceTests/When_transitioning_correlation_property.cs

@@ -23,7 +23,7 @@ public void Should_remove_old_property_after_phase_three()
             connection.Open();
 
             //HACK: Thread Sleeps required since information_schema.statistics takes some time to update
-            var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase1Saga), dialect);
+            var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase1Saga>(dialect);
             connection.ExecuteCommand(SagaScriptBuilder.BuildDropScript(sagaPhase1, dialect), "");
             Thread.Sleep(200);
             connection.ExecuteCommand(SagaScriptBuilder.BuildCreateScript(sagaPhase1, dialect), "");
@@ -32,14 +32,14 @@ public void Should_remove_old_property_after_phase_three()
             Assert.That(phase1Schema, Has.Member("Correlation_OrderNumber"));
             Assert.That(phase1Schema, Has.No.Member("Correlation_OrderId"));
 
-            var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase2Saga), dialect);
+            var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase2Saga>(dialect);
             connection.ExecuteCommand(SagaScriptBuilder.BuildCreateScript(sagaPhase2, dialect), "");
             Thread.Sleep(200);
             var phase2Schema = GetSchema(connection);
             Assert.That(phase2Schema, Has.Member("Correlation_OrderNumber"));
             Assert.That(phase2Schema, Has.Member("Correlation_OrderId"));
 
-            var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase3Saga), dialect);
+            var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase3Saga>(dialect);
             connection.ExecuteCommand(SagaScriptBuilder.BuildCreateScript(sagaPhase3, dialect), "");
             Thread.Sleep(200);
             var phase3Schema = GetSchema(connection);

src/OracleAcceptanceTests/When_transitioning_correlation_property.cs

@@ -16,9 +16,9 @@ public class When_transitioning_correlation_property : NServiceBusAcceptanceTest
     public async Task Should_remove_old_property_after_phase_three()
     {
         var dialect = BuildSqlDialect.Oracle;
-        var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase1Saga), dialect);
-        var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase2Saga), dialect);
-        var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase3Saga), dialect);
+        var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase1Saga>(dialect);
+        var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase2Saga>(dialect);
+        var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase3Saga>(dialect);
 
         string[] phase1Schema, phase2Schema, phase3Schema;
 

src/PostgreSqlAcceptanceTests/When_transitioning_correlation_property.cs

@@ -16,9 +16,9 @@ public class When_transitioning_correlation_property : NServiceBusAcceptanceTest
     public async Task Should_remove_old_property_after_phase_three()
     {
         var dialect = BuildSqlDialect.PostgreSql;
-        var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase1Saga), dialect);
-        var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase2Saga), dialect);
-        var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition(typeof(Phase3Saga), dialect);
+        var sagaPhase1 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase1Saga>(dialect);
+        var sagaPhase2 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase2Saga>(dialect);
+        var sagaPhase3 = RuntimeSagaDefinitionReader.GetSagaDefinition<Phase3Saga>(dialect);
 
         using (var connection = PostgreSqlConnectionBuilder.Build())
         {