Merge pull request #52 from mauroservienti/thread-safe-integration-co…

…ntext

Thread safe integration context

src/NServiceBus.IntegrationTesting/IntegrationContext.cs

@@ -1,4 +1,5 @@
 using NServiceBus.AcceptanceTesting;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -7,9 +8,11 @@ namespace NServiceBus.IntegrationTesting
 {
  public class IntegrationContext : ScenarioContext
  {
- List<HandlerInvocation> invokedHandlers = new List<HandlerInvocation>();
+ readonly ConcurrentBag<HandlerInvocation> invokedHandlers = new ConcurrentBag<HandlerInvocation>();
+ readonly ConcurrentBag<SagaInvocation> invokedSagas = new ConcurrentBag<SagaInvocation>();
 
  public IEnumerable<HandlerInvocation> InvokedHandlers { get { return invokedHandlers; } }
+ public IEnumerable<SagaInvocation> InvokedSagas { get { return invokedSagas; } }
 
  internal HandlerInvocation CaptureInvokedHandler(HandlerInvocation invocation)
  {
@@ -18,19 +21,14 @@ internal HandlerInvocation CaptureInvokedHandler(HandlerInvocation invocation)
  return invocation;
  }
 
- List<SagaInvocation> invokedSagas = new List<SagaInvocation>();
-
- public IEnumerable<SagaInvocation> InvokedSagas { get { return invokedSagas; } }
-
-
  internal SagaInvocation CaptureInvokedSaga(SagaInvocation invocation)
  {
  invokedSagas.Add(invocation);
 
  return invocation;
  }
 
- static PropertyInfo GetCurrentProperty()
+ static PropertyInfo GetScenarioContextCurrentProperty()
  {
  return typeof(ScenarioContext).GetProperty("Current", BindingFlags.Static | BindingFlags.NonPublic);
  }
@@ -39,7 +37,7 @@ public static IntegrationContext CurrentContext
  {
  get
  {
- var pi = GetCurrentProperty();
+ var pi = GetScenarioContextCurrentProperty();
  var current = (IntegrationContext)pi.GetMethod.Invoke(null, null);
 
  return current;