Allow to pre-create Saga instances

src/MySystem.AcceptanceTests/When_requesting_a_timeout.cs

@@ -38,9 +38,9 @@ public async Task It_should_be_rescheduled_and_handled()
  .Done(ctx => ctx.MessageWasProcessedBySaga<ASaga.MyTimeout, ASaga>() || ctx.HasFailedMessages())
  .Run();
 
- Assert.True(context.MessageWasProcessedBySaga<ASaga.MyTimeout, ASaga>());
- Assert.False(context.HasFailedMessages());
- Assert.False(context.HasHandlingErrors());
+ Assert.False(context.HasFailedMessages(), "There are failed messages");
+ Assert.False(context.HasHandlingErrors(), "There were handling errors");
+ Assert.True(context.MessageWasProcessedBySaga<ASaga.MyTimeout, ASaga>(), "MyTimeout was not processed by ASaga");
  }
 
  class MyServiceEndpoint : EndpointConfigurationBuilder

src/MySystem.AcceptanceTests/When_sending_AMessage.cs

@@ -40,11 +40,11 @@ public async Task AReplyMessage_is_received_and_ASaga_is_started()
 
  var invokedSaga = context.InvokedSagas.Single(s => s.SagaType == typeof(ASaga));
 
+ Assert.False(context.HasFailedMessages(), "There are failed messages");
+ Assert.False(context.HasHandlingErrors(), "There were handling errors");
  Assert.True(invokedSaga.IsNew);
  Assert.AreEqual("MyService", invokedSaga.EndpointName);
  Assert.True(((ASagaData)invokedSaga.SagaData).AnIdentifier == theExpectedIdentifier);
- Assert.False(context.HasFailedMessages());
- Assert.False(context.HasHandlingErrors());
  }
 
  class MyServiceEndpoint : EndpointConfigurationBuilder

src/MySystem.AcceptanceTests/When_sending_CompleteASaga.cs

@@ -38,7 +38,7 @@ public async Task ASaga_is_completed()
  behavior.When(condition: ctx =>
  {
  return ctx.SagaWasInvoked<ASaga>() && ctx.InvokedSagas.Any(s=> s.SagaType == typeof(ASaga) && s.IsNew);
- }, 
+ },
  action: session =>
  {
  return session.Send("MyService", new CompleteASaga {AnIdentifier = theExpectedIdentifier});
@@ -54,10 +54,10 @@ public async Task ASaga_is_completed()
  var newSaga = invokedSagas.SingleOrDefault(s => s.IsNew);
  var completedSaga = invokedSagas.SingleOrDefault(s => s.IsCompleted);
 
+ Assert.False(context.HasFailedMessages(), "There are failed messages");
+ Assert.False(context.HasHandlingErrors(), "There were handling errors");
  Assert.IsNotNull(newSaga);
  Assert.IsNotNull(completedSaga);
- Assert.False(context.HasFailedMessages());
- Assert.False(context.HasHandlingErrors());
  }
 
  class MyServiceEndpoint : EndpointConfigurationBuilder

src/NServiceBus.IntegrationTesting/EndpointTemplate.cs

@@ -1,7 +1,9 @@
 using NServiceBus.AcceptanceTesting.Support;
 using NServiceBus.Configuration.AdvancedExtensibility;
+using NServiceBus.IntegrationTesting.Messages.Handlers;
 using System;
 using System.Threading.Tasks;
+using NServiceBus.AcceptanceTesting.Customization;
 
 namespace NServiceBus.IntegrationTesting
 {
@@ -13,11 +15,16 @@ public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescr
 
  var settings = configuration.GetSettings();
  endpointCustomizationConfiguration.EndpointName = settings.EndpointName();
+ configurationBuilderCustomization(configuration);
 
- configuration.RegisterRequiredPipelineBehaviors(endpointCustomizationConfiguration.EndpointName, (IntegrationScenarioContext)runDescriptor.ScenarioContext);
- configuration.RegisterScenarioContext(runDescriptor.ScenarioContext);
+ configuration.TypesToIncludeInScan(new[]
+ {
+ typeof(CreateSagaInstanceHandler),
+ typeof(MarkSagaInstanceAsCreatedHandler)
+ });
 
- configurationBuilderCustomization(configuration);
+ configuration.RegisterScenarioContext(runDescriptor.ScenarioContext);
+ configuration.RegisterRequiredPipelineBehaviors(endpointCustomizationConfiguration.EndpointName, (IntegrationScenarioContext)runDescriptor.ScenarioContext);
 
  return configuration;
  }

src/NServiceBus.IntegrationTesting/IntegrationScenarioContext.cs

@@ -14,6 +14,7 @@ public class IntegrationScenarioContext : ScenarioContext
  readonly ConcurrentBag<SagaInvocation> invokedSagas = new ConcurrentBag<SagaInvocation>();
  readonly ConcurrentBag<OutgoingMessageOperation> outgoingMessageOperations = new ConcurrentBag<OutgoingMessageOperation>();
  readonly Dictionary<Type, Func<object, DoNotDeliverBefore, DoNotDeliverBefore>> timeoutRescheduleRules = new Dictionary<Type, Func<object, DoNotDeliverBefore, DoNotDeliverBefore>>();
+ readonly ConcurrentDictionary<Guid, Type> createdSagaInstances = new ConcurrentDictionary<Guid, Type>();
 
  public IEnumerable<HandlerInvocation> InvokedHandlers { get { return invokedHandlers; } }
  public IEnumerable<SagaInvocation> InvokedSagas { get { return invokedSagas; } }
@@ -53,6 +54,16 @@ internal SagaInvocation CaptureInvokedSaga(SagaInvocation invocation)
  return invocation;
  }
 
+ internal void RegisterSagaInstanceAsCreated(Guid sagaId, Type sagaDataType)
+ {
+ createdSagaInstances.AddOrUpdate(sagaId, sagaDataType, (id, type) => type);
+ }
+
+ public bool IsSagaInstanceAvailable(Guid sagaId)
+ {
+ return createdSagaInstances.ContainsKey(sagaId);
+ }
+
  public bool HandlerWasInvoked<THandler>()
  {
  return InvokedHandlers.Any(invocation => invocation.HandlerType == typeof(THandler));

src/NServiceBus.IntegrationTesting/MessageSessionExtensions.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Threading.Tasks;
+
+namespace NServiceBus.IntegrationTesting
+{
+ public static class MessageSessionExtensions
+ {
+ public static Task CreateSagaInstance<TSagaData>(this IMessageSession messageSession, string sagaOwnerEndpoint, Guid sagaId, TSagaData sagaData, string originator = null, string originatingMessageId = null) where TSagaData : IContainSagaData
+ {
+ sagaData.Id = sagaId;
+ sagaData.Originator = originator;
+ sagaData.OriginalMessageId = originatingMessageId;
+
+ return messageSession.Send(sagaOwnerEndpoint, new Messages.CreateSagaInstance() 
+ { 
+ SagaData = sagaData
+ });
+ }
+ }
+}

src/NServiceBus.IntegrationTesting/Messages/CreateSagaInstance.cs

@@ -0,0 +1,9 @@
+namespace NServiceBus.IntegrationTesting.Messages
+{
+ class CreateSagaInstance
+ {
+ public string CorrelationPropertyName { get; set; }
+ public object CorrelationPropertyValue { get; set; }
+ public IContainSagaData SagaData { get; set; }
+ }
+}

src/NServiceBus.IntegrationTesting/Messages/Handlers/CreateSagaInstanceHandler.cs

@@ -0,0 +1,35 @@
+using NServiceBus.AcceptanceTesting;
+using NServiceBus.Sagas;
+using System.Threading.Tasks;
+
+namespace NServiceBus.IntegrationTesting.Messages.Handlers
+{
+ class CreateSagaInstanceHandler : IHandleMessages<CreateSagaInstance>
+ {
+ readonly ISagaPersister sagaPersister;
+
+ public CreateSagaInstanceHandler(ISagaPersister sagaPersister)
+ {
+ this.sagaPersister = sagaPersister;
+ }
+
+ public async Task Handle(CreateSagaInstance message, IMessageHandlerContext context)
+ {
+ var correlationProperty = new SagaCorrelationProperty(
+ message.CorrelationPropertyName, 
+ message.CorrelationPropertyValue);
+
+ await sagaPersister.Save(message.SagaData, 
+ correlationProperty, 
+ context.SynchronizedStorageSession, 
+ new Extensibility.ContextBag())
+ .ConfigureAwait(false);
+
+ await context.SendLocal(new MarkSagaInstanceAsCreated() 
+ {
+ SagaId = message.SagaData.Id,
+ SagaDataType = message.SagaData.GetType()
+ }).ConfigureAwait(false);
+ }
+ }
+}

src/NServiceBus.IntegrationTesting/Messages/Handlers/MarkSagaInstanceAsCreatedHandler.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NServiceBus.IntegrationTesting.Messages.Handlers
+{
+ class MarkSagaInstanceAsCreatedHandler : IHandleMessages<MarkSagaInstanceAsCreated>
+ {
+ readonly IntegrationScenarioContext integrationScenarioContext;
+
+ public MarkSagaInstanceAsCreatedHandler(IntegrationScenarioContext integrationScenarioContext)
+ {
+ this.integrationScenarioContext = integrationScenarioContext;
+ }
+
+ public Task Handle(MarkSagaInstanceAsCreated message, IMessageHandlerContext context)
+ {
+ integrationScenarioContext.RegisterSagaInstanceAsCreated(message.SagaId, message.SagaDataType);
+
+ return Task.CompletedTask;
+ }
+ }
+}

src/NServiceBus.IntegrationTesting/Messages/MarkSagaInstanceAsCreated.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace NServiceBus.IntegrationTesting.Messages
+{
+ class MarkSagaInstanceAsCreated
+ {
+ public Guid SagaId { get; set; }
+ public Type SagaDataType { get; set; }
+ }
+}