fixing tests

andrey.leskov · andrey.leskov · commit a9bf68fb53fa · 2016-11-21T21:47:05.000+03:00
diff --git a/GridDomain.CQRS.Messaging.Akka/LocalAkkaEventBusTransport.cs b/GridDomain.CQRS.Messaging.Akka/LocalAkkaEventBusTransport.cs
@@ -33,18 +33,14 @@ public void Subscribe(Type messageType, IActorRef actor, IActorRef subscribeNoti
             Subscribe(messageType, actor);
         }
 
-        public void Publish<T>(T msg)
-        {
-            _log.Trace("Publishing {@Message} to transport", msg);
-            _bus.Publish(msg);
-        }
-
         public void Publish(params object[] messages)
         {
             foreach (var msg in messages)
-                Publish<object>(msg);
+            {
+                _log.Trace("Publishing {@Message} to transport", msg);
+                _bus.Publish(msg);
+            }
         }
-    
 
         public void Subscribe(Type messageType, IActorRef actor)
         {
diff --git a/GridDomain.CQRS.Messaging.Akka/Remote/RemoteAkkaEventBusTransport.cs b/GridDomain.CQRS.Messaging.Akka/Remote/RemoteAkkaEventBusTransport.cs
@@ -17,11 +17,6 @@ public RemoteAkkaEventBusTransport(IActorTransport local,  IActorRef remoteSubsc
             _local = local;
         }
 
-        public void Publish<T>(T msg)
-        {
-            Publish((object)msg);
-        }
-
         public void Publish(params object[] messages)
         {
             _local.Publish(messages);
diff --git a/GridDomain.CQRS.Messaging/IPublisher.cs b/GridDomain.CQRS.Messaging/IPublisher.cs
@@ -2,7 +2,6 @@
 {
     public interface IPublisher
     {
-        void Publish<T>(T msg);
         void Publish(params object[] msg);
     }
 }
diff --git a/GridDomain.CQRS/IExpectBuilder.cs b/GridDomain.CQRS/IExpectBuilder.cs
@@ -4,7 +4,6 @@ namespace GridDomain.CQRS
 {
     public interface IExpectBuilder<out T>
     {
-        //T Create(TimeSpan timeout);
         T Create();
         IExpectBuilder<T> And<TMsg>(Predicate<TMsg> filter = null);
         IExpectBuilder<T> Or<TMsg>(Func<TMsg, bool> filter = null);
diff --git a/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_any_of_start_messages.cs b/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_any_of_start_messages.cs
@@ -1,4 +1,9 @@
 using System;
+using GridDomain.CQRS;
+using GridDomain.EventSourcing.Sagas;
+using GridDomain.EventSourcing.Sagas.InstanceSagas;
+using GridDomain.Node.AkkaMessaging.Waiting;
+using GridDomain.Tests.Framework;
 using GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Events;
 using NUnit.Framework;
 
@@ -17,13 +22,6 @@ public Given_saga_When_publishing_any_of_start_messages():
             
         }
 
-        [OneTimeSetUp]
-        public void Setup()
-        {
-            When_publishing_start_message();
-        }
-
-
         [Then]
         public void Saga_data_is_not_null()
         {
@@ -36,5 +34,10 @@ public void Saga_has_correct_id()
         {
             Assert.AreEqual(_sagaId, SagaData.Id);
         }
+
+        protected override IExpectBuilder<AnyMessagePublisher> ConfigureWait(IMessageWaiter<AnyMessagePublisher> waiter)
+        {
+            return waiter.Expect<SagaCreatedEvent<SoftwareProgrammingSagaData>>();
+        }
     }
 }
diff --git a/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_several_start_messages.cs b/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_several_start_messages.cs
@@ -1,4 +1,8 @@
 using System;
+using GridDomain.CQRS;
+using GridDomain.EventSourcing.Sagas;
+using GridDomain.EventSourcing.Sagas.InstanceSagas;
+using GridDomain.Tests.Framework;
 using GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Events;
 using NUnit.Framework;
 
@@ -27,24 +31,22 @@ public Given_saga_When_publishing_several_start_messages(): base(SagaId,GetMessa
 
         }
 
-        [OneTimeSetUp]
-        public void Setup()
-        {
-            base.When_publishing_start_message();
-        }
-
         [Then]
         public void Saga_reinitialized_from_last_start_message()
         {
             Assert.AreEqual(secondMessage.SofaId, SagaData.Data.SofaId);
         }
 
-
         [Then]
         public void Saga_has_correct_state()
         {
             var saga = new SoftwareProgrammingSaga();
             Assert.AreEqual(saga.Coding.Name, SagaData.Data.CurrentStateName);
         }
+
+        protected override IExpectBuilder<AnyMessagePublisher> ConfigureWait(IMessageWaiter<AnyMessagePublisher> waiter)
+        {
+            return waiter.Expect<SagaCreatedEvent<SoftwareProgrammingSagaData>>();
+        }
     }
 }
diff --git a/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_start_message_A.cs b/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_start_message_A.cs
@@ -1,38 +1,46 @@
 ﻿using System;
+using GridDomain.CQRS;
+using GridDomain.EventSourcing.Sagas;
+using GridDomain.EventSourcing.Sagas.InstanceSagas;
+using GridDomain.Tests.Framework;
 using GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Events;
 using NUnit.Framework;
 
 namespace GridDomain.Tests.Sagas.InstanceSagas
 {
     [TestFixture]
-    class Given_saga_When_publishing_start_message_A : Given_saga_When_publishing_start_messages
+    class Given_saga_When_publishing_start_message_A : SoftwareProgrammingInstanceSagaTest
     {
-        private static readonly GotTiredEvent StartMessage = new GotTiredEvent(Guid.NewGuid(), Guid.NewGuid(),
-            Guid.NewGuid(), Guid.NewGuid());
-        public Given_saga_When_publishing_start_message_A():base(StartMessage.SagaId, StartMessage)
-        {
-            
+        private static readonly GotTiredEvent StartMessage = 
+            new GotTiredEvent(Guid.NewGuid(), 
+                              Guid.NewGuid(),
+                              Guid.NewGuid(),
+                              Guid.NewGuid());
 
-        }
+        private SagaDataAggregate<SoftwareProgrammingSagaData> _sagaData;
 
         [OneTimeSetUp]
-        public void Setup()
+        public void When_publishing_start_message()
         {
-            base.When_publishing_start_message();
-        }
+            GridNode.NewDebugWaiter()
+                    .Expect<SagaCreatedEvent<SoftwareProgrammingSagaData>>()
+                    .Create()
+                    .Publish(StartMessage)
+                    .Wait();
 
+            _sagaData = LoadAggregate<SagaDataAggregate<SoftwareProgrammingSagaData>>(StartMessage.SagaId);
+        }
 
         [Then]
         public void Saga_has_correct_data()
         {
-            Assert.AreEqual(StartMessage.PersonId, SagaData.Data.PersonId);
+            Assert.AreEqual(StartMessage.PersonId, _sagaData.Data.PersonId);
         }
 
         [Then]
         public void Saga_has_correct_state()
         {
-            var saga = new SoftwareProgrammingSaga();
-            Assert.AreEqual(saga.MakingCoffee.Name, SagaData.Data.CurrentStateName);
+            Assert.AreEqual(nameof(SoftwareProgrammingSaga.MakingCoffee), _sagaData.Data.CurrentStateName);
         }
     }
 }
diff --git a/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_start_message_B.cs b/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_start_message_B.cs
@@ -1,37 +1,41 @@
 using System;
+using GridDomain.CQRS;
+using GridDomain.EventSourcing.Sagas;
+using GridDomain.EventSourcing.Sagas.InstanceSagas;
+using GridDomain.Tests.Framework;
 using GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Events;
 using NUnit.Framework;
 
 namespace GridDomain.Tests.Sagas.InstanceSagas
 {
     [TestFixture]
-    class Given_saga_When_publishing_start_message_B : Given_saga_When_publishing_start_messages
+    class Given_saga_When_publishing_start_message_B : SoftwareProgrammingInstanceSagaTest
     {
         private static readonly SleptWellEvent StartMessage = new SleptWellEvent(Guid.NewGuid(),Guid.NewGuid(),Guid.NewGuid(), null);
-
-        public Given_saga_When_publishing_start_message_B() : base(StartMessage.SagaId, StartMessage)
-        {
-
-
-        }
+        private SagaDataAggregate<SoftwareProgrammingSagaData> _sagaData;
 
         [OneTimeSetUp]
-        public void Setup()
+        public void When_publishing_start_message()
         {
-            base.When_publishing_start_message();
+            GridNode.NewDebugWaiter()
+                    .Expect<SagaCreatedEvent<SoftwareProgrammingSagaData>>()
+                    .Create()
+                    .Publish(StartMessage)
+                    .Wait();
+
+            _sagaData = LoadAggregate<SagaDataAggregate<SoftwareProgrammingSagaData>>(StartMessage.SagaId);
         }
 
         [Then]
         public void Saga_has_correct_data()
         {
-            Assert.AreEqual(StartMessage.SofaId, SagaData.Data.SofaId);
+            Assert.AreEqual(StartMessage.SofaId, _sagaData.Data.SofaId);
         }
 
         [Then]
         public void Saga_has_correct_state()
         {
-            var saga = new SoftwareProgrammingSaga();
-            Assert.AreEqual(saga.Coding.Name, SagaData.Data.CurrentStateName);
+            Assert.AreEqual(nameof(SoftwareProgrammingSaga.Coding), _sagaData.Data.CurrentStateName);
         }
     }
 }
diff --git a/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_start_messages.cs b/GridDomain.Domain.Tests/Sagas/InstanceSagas/Given_saga_When_publishing_start_messages.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Threading;
+using GridDomain.CQRS;
 using GridDomain.EventSourcing.Sagas.InstanceSagas;
+using GridDomain.Node.AkkaMessaging.Waiting;
+using GridDomain.Tests.Framework;
+using NUnit.Framework;
 
 namespace GridDomain.Tests.Sagas.InstanceSagas
 {
-    class Given_saga_When_publishing_start_messages : SoftwareProgrammingInstanceSagaTest   
+    abstract class Given_saga_When_publishing_start_messages : SoftwareProgrammingInstanceSagaTest   
     {
         protected readonly Guid _sagaId;
         private readonly object[] _sagaMessages;
@@ -15,17 +19,21 @@ public Given_saga_When_publishing_start_messages(Guid sagaId, params object[] me
         {
             _sagaMessages = messages;
             _sagaId = sagaId;
-
         }
-      
+
+        [OneTimeSetUp]
         public void When_publishing_start_message()
         {
-            foreach(var msg in _sagaMessages)
-                GridNode.Transport.Publish(msg);
+            var waiter = GridNode.NewDebugWaiter(Timeout);
 
-            Thread.Sleep(Timeout);
+            ConfigureWait(waiter)
+                        .Create()
+                        .Publish(_sagaMessages)
+                        .Wait();
 
             SagaData = LoadAggregate<SagaDataAggregate<SoftwareProgrammingSagaData>>(_sagaId);
         }
+
+        protected abstract IExpectBuilder<AnyMessagePublisher> ConfigureWait(IMessageWaiter<AnyMessagePublisher> waiter);
     }
 }
diff --git a/GridDomain.Domain.Tests/Sagas/InstanceSagas/SoftwareProgrammingInstanceSagaTest.cs b/GridDomain.Domain.Tests/Sagas/InstanceSagas/SoftwareProgrammingInstanceSagaTest.cs
@@ -37,7 +37,7 @@ protected override IContainerConfiguration CreateConfiguration()
                 );
         }
 
-        public SoftwareProgrammingInstanceSagaTest(bool inMemory = true) : base(inMemory)
+        protected SoftwareProgrammingInstanceSagaTest(bool inMemory = true) : base(inMemory)
         {
         }
     }
diff --git a/GridDomain.Domain.Tests/Sagas/InstanceSagas/SoftwareProgrammingSaga.cs b/GridDomain.Domain.Tests/Sagas/InstanceSagas/SoftwareProgrammingSaga.cs
@@ -45,8 +45,10 @@ public SoftwareProgrammingSaga()
                     var soloLogger = LogManager.GetLogger();
                     soloLogger.Trace("Hello trace string");
                     Dispatch(new MakeCoffeCommand(domainEvent.SourceId,sagaData.CoffeeMachineId));
-                })
-                .TransitionTo(MakingCoffee));
+                }).TransitionTo(MakingCoffee),
+
+                When(SleptWell).Then(ctx => ctx.Instance.SofaId = ctx.Data.SofaId)
+                               .TransitionTo(Coding));
 
             During(MakingCoffee, 
                 When(CoffeNotAvailable)
diff --git a/GridDomain.Node/AkkaMessaging/Waiting/AkkaCommandLocalWaiter.cs b/GridDomain.Node/AkkaMessaging/Waiting/AkkaCommandLocalWaiter.cs
@@ -13,6 +13,6 @@ public AkkaCommandLocalWaiter(ICommandExecutor executor,ActorSystem system, IAct
             ExpectBuilder = new CommandExpectBuilder(executor, this, defaultTimeout, failOnAnyFault);
         }
 
-        internal override ExpectBuilder<IExpectedCommandExecutor> ExpectBuilder { get; } 
+        public override ExpectBuilder<IExpectedCommandExecutor> ExpectBuilder { get; } 
     }
 }
diff --git a/GridDomain.Node/AkkaMessaging/Waiting/AkkaMessageLocalWaiter.cs b/GridDomain.Node/AkkaMessaging/Waiting/AkkaMessageLocalWaiter.cs
@@ -15,6 +15,6 @@ public AkkaMessageLocalWaiter(ActorSystem system, IActorSubscriber subscriber, T
             ExpectBuilder = new MessageExpectBuilder(this, defaultTimeout);
         }
 
-        internal override ExpectBuilder<Task<IWaitResults>> ExpectBuilder { get; }
+        public override ExpectBuilder<Task<IWaitResults>> ExpectBuilder { get; }
     }
 }
diff --git a/GridDomain.Node/AkkaMessaging/Waiting/ExpectedCommandExecutor.cs b/GridDomain.Node/AkkaMessaging/Waiting/ExpectedCommandExecutor.cs
@@ -13,7 +13,9 @@ class ExpectedCommandExecutor: IExpectedCommandExecutor
 
         public ICommandExecutor Executor { get; }
 
-        public ExpectedCommandExecutor(ICommandExecutor executor, LocalMessagesWaiter<IExpectedCommandExecutor> waiter, bool failOnFaults)
+        public ExpectedCommandExecutor(ICommandExecutor executor, 
+                                       LocalMessagesWaiter<IExpectedCommandExecutor> waiter,
+                                       bool failOnFaults)
         {
             _failOnFaults = failOnFaults;
             Executor = executor;
diff --git a/GridDomain.Node/AkkaMessaging/Waiting/LocalMessagesWaiter.cs b/GridDomain.Node/AkkaMessaging/Waiting/LocalMessagesWaiter.cs
@@ -23,7 +23,7 @@ public abstract class LocalMessagesWaiter<T> : IMessageWaiter<T>
         private Func<IEnumerable<object>,bool> _stopCondition;
 
         private readonly TimeSpan _defaultTimeout;
-        internal abstract ExpectBuilder<T> ExpectBuilder { get; }
+        public abstract ExpectBuilder<T> ExpectBuilder { get; }
         private readonly List<Type> _messageTypesToSubscribe = new List<Type>();
         private readonly ActorSystem _system;
 
diff --git a/GridDomain.Tests.Acceptance/GridConsole/GridConsoleTests.cs b/GridDomain.Tests.Acceptance/GridConsole/GridConsoleTests.cs
@@ -15,7 +15,6 @@
 namespace GridDomain.Tests.Acceptance.GridConsole
 {
     [TestFixture]
-   // [Ignore("Console is not relevant now")]
     public class GridConsoleTests
     {
         private GridNodeConnector _connector;
diff --git a/GridDomain.Tests.Framework/AnyMessageExpectBuilder.cs b/GridDomain.Tests.Framework/AnyMessageExpectBuilder.cs
@@ -0,0 +1,21 @@
+using System;
+using GridDomain.CQRS.Messaging;
+using GridDomain.Node.AkkaMessaging.Waiting;
+
+namespace GridDomain.Tests.Framework
+{
+    public class AnyMessageExpectBuilder : ExpectBuilder<AnyMessagePublisher>
+    {
+        private readonly IPublisher _publisher;
+
+        public AnyMessageExpectBuilder(IPublisher publisher, LocalMessagesWaiter<AnyMessagePublisher> waiter, TimeSpan defaultTimeout) : base(waiter)
+        {
+            _publisher = publisher;
+        }
+
+        public override AnyMessagePublisher Create(TimeSpan? timeout)
+        {
+            return new AnyMessagePublisher(_publisher,Waiter);
+        }
+    }
+}
diff --git a/GridDomain.Tests.Framework/AnyMessagePublisher.cs b/GridDomain.Tests.Framework/AnyMessagePublisher.cs
diff --git a/GridDomain.Tests.Framework/AutoFix.cs b/GridDomain.Tests.Framework/AutoFix.cs
diff --git a/GridDomain.Tests.Framework/AutoTestLogFactory.cs b/GridDomain.Tests.Framework/AutoTestLogFactory.cs
diff --git a/GridDomain.Tests.Framework/Configuration/AutoTestAkkaNetworkAddress.cs b/GridDomain.Tests.Framework/Configuration/AutoTestAkkaNetworkAddress.cs
diff --git a/GridDomain.Tests.Framework/DebugLocalWaiter.cs b/GridDomain.Tests.Framework/DebugLocalWaiter.cs
diff --git a/GridDomain.Tests.Framework/DebugMessageWaiterFactory.cs b/GridDomain.Tests.Framework/DebugMessageWaiterFactory.cs
diff --git a/GridDomain.Tests.Framework/GridDomain.Tests.Framework.csproj b/GridDomain.Tests.Framework/GridDomain.Tests.Framework.csproj

Original file line number	Diff line number	Diff line change
`@@ -33,18 +33,14 @@ public void Subscribe(Type messageType, IActorRef actor, IActorRef subscribeNoti`
`33`	`33`	`Subscribe(messageType, actor);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public void Publish<T>(T msg)`
`37`		`- {`
`38`		`- _log.Trace("Publishing {@Message} to transport", msg);`
`39`		`- _bus.Publish(msg);`
`40`		`- }`
`41`		`-`
`42`	`36`	`public void Publish(params object[] messages)`
`43`	`37`	`{`
`44`	`38`	`foreach (var msg in messages)`
`45`		`- Publish<object>(msg);`
	`39`	`+ {`
	`40`	`+ _log.Trace("Publishing {@Message} to transport", msg);`
	`41`	`+ _bus.Publish(msg);`
	`42`	`+ }`
`46`	`43`	`}`
`47`		`-`
`48`	`44`
`49`	`45`	`public void Subscribe(Type messageType, IActorRef actor)`
`50`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,6 @@ public RemoteAkkaEventBusTransport(IActorTransport local, IActorRef remoteSubsc`
`17`	`17`	`_local = local;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public void Publish<T>(T msg)`
`21`		`- {`
`22`		`- Publish((object)msg);`
`23`		`- }`
`24`		`-`
`25`	`20`	`public void Publish(params object[] messages)`
`26`	`21`	`{`
`27`	`22`	`_local.Publish(messages);`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`public interface IPublisher`
`4`	`4`	`{`
`5`		`- void Publish<T>(T msg);`
`6`	`5`	`void Publish(params object[] msg);`
`7`	`6`	`}`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ namespace GridDomain.CQRS`
`4`	`4`	`{`
`5`	`5`	`public interface IExpectBuilder<out T>`
`6`	`6`	`{`
`7`		`- //T Create(TimeSpan timeout);`
`8`	`7`	`T Create();`
`9`	`8`	`IExpectBuilder<T> And<TMsg>(Predicate<TMsg> filter = null);`
`10`	`9`	`IExpectBuilder<T> Or<TMsg>(Func<TMsg, bool> filter = null);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,9 @@`
`1`	`1`	`using System;`
	`2`	`+using GridDomain.CQRS;`
	`3`	`+using GridDomain.EventSourcing.Sagas;`
	`4`	`+using GridDomain.EventSourcing.Sagas.InstanceSagas;`
	`5`	`+using GridDomain.Node.AkkaMessaging.Waiting;`
	`6`	`+using GridDomain.Tests.Framework;`
`2`	`7`	`using GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Events;`
`3`	`8`	`using NUnit.Framework;`
`4`	`9`
`@@ -17,13 +22,6 @@ public Given_saga_When_publishing_any_of_start_messages():`
`17`	`22`
`18`	`23`	`}`
`19`	`24`
`20`		`- [OneTimeSetUp]`
`21`		`- public void Setup()`
`22`		`- {`
`23`		`- When_publishing_start_message();`
`24`		`- }`
`25`		`-`
`26`		`-`
`27`	`25`	`[Then]`
`28`	`26`	`public void Saga_data_is_not_null()`
`29`	`27`	`{`
`@@ -36,5 +34,10 @@ public void Saga_has_correct_id()`
`36`	`34`	`{`
`37`	`35`	`Assert.AreEqual(_sagaId, SagaData.Id);`
`38`	`36`	`}`
	`37`	`+`
	`38`	`+ protected override IExpectBuilder<AnyMessagePublisher> ConfigureWait(IMessageWaiter<AnyMessagePublisher> waiter)`
	`39`	`+ {`
	`40`	`+ return waiter.Expect<SagaCreatedEvent<SoftwareProgrammingSagaData>>();`
	`41`	`+ }`
`39`	`42`	`}`
`40`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`using System;`
	`2`	`+using GridDomain.CQRS;`
	`3`	`+using GridDomain.EventSourcing.Sagas;`
	`4`	`+using GridDomain.EventSourcing.Sagas.InstanceSagas;`
	`5`	`+using GridDomain.Tests.Framework;`
`2`	`6`	`using GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Events;`
`3`	`7`	`using NUnit.Framework;`
`4`	`8`
`@@ -27,24 +31,22 @@ public Given_saga_When_publishing_several_start_messages(): base(SagaId,GetMessa`
`27`	`31`
`28`	`32`	`}`
`29`	`33`
`30`		`- [OneTimeSetUp]`
`31`		`- public void Setup()`
`32`		`- {`
`33`		`- base.When_publishing_start_message();`
`34`		`- }`
`35`		`-`
`36`	`34`	`[Then]`
`37`	`35`	`public void Saga_reinitialized_from_last_start_message()`
`38`	`36`	`{`
`39`	`37`	`Assert.AreEqual(secondMessage.SofaId, SagaData.Data.SofaId);`
`40`	`38`	`}`
`41`	`39`
`42`		`-`
`43`	`40`	`[Then]`
`44`	`41`	`public void Saga_has_correct_state()`
`45`	`42`	`{`
`46`	`43`	`var saga = new SoftwareProgrammingSaga();`
`47`	`44`	`Assert.AreEqual(saga.Coding.Name, SagaData.Data.CurrentStateName);`
`48`	`45`	`}`
	`46`	`+`
	`47`	`+ protected override IExpectBuilder<AnyMessagePublisher> ConfigureWait(IMessageWaiter<AnyMessagePublisher> waiter)`
	`48`	`+ {`
	`49`	`+ return waiter.Expect<SagaCreatedEvent<SoftwareProgrammingSagaData>>();`
	`50`	`+ }`
`49`	`51`	`}`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,37 +1,41 @@`
`1`	`1`	`using System;`
	`2`	`+using GridDomain.CQRS;`
	`3`	`+using GridDomain.EventSourcing.Sagas;`
	`4`	`+using GridDomain.EventSourcing.Sagas.InstanceSagas;`
	`5`	`+using GridDomain.Tests.Framework;`
`2`	`6`	`using GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Events;`
`3`	`7`	`using NUnit.Framework;`
`4`	`8`
`5`	`9`	`namespace GridDomain.Tests.Sagas.InstanceSagas`
`6`	`10`	`{`
`7`	`11`	`[TestFixture]`
`8`		`- class Given_saga_When_publishing_start_message_B : Given_saga_When_publishing_start_messages`
	`12`	`+ class Given_saga_When_publishing_start_message_B : SoftwareProgrammingInstanceSagaTest`
`9`	`13`	`{`
`10`	`14`	`private static readonly SleptWellEvent StartMessage = new SleptWellEvent(Guid.NewGuid(),Guid.NewGuid(),Guid.NewGuid(), null);`
`11`		`-`
`12`		`- public Given_saga_When_publishing_start_message_B() : base(StartMessage.SagaId, StartMessage)`
`13`		`- {`
`14`		`-`
`15`		`-`
`16`		`- }`
	`15`	`+ private SagaDataAggregate<SoftwareProgrammingSagaData> _sagaData;`
`17`	`16`
`18`	`17`	`[OneTimeSetUp]`
`19`		`- public void Setup()`
	`18`	`+ public void When_publishing_start_message()`
`20`	`19`	`{`
`21`		`- base.When_publishing_start_message();`
	`20`	`+ GridNode.NewDebugWaiter()`
	`21`	`+ .Expect<SagaCreatedEvent<SoftwareProgrammingSagaData>>()`
	`22`	`+ .Create()`
	`23`	`+ .Publish(StartMessage)`
	`24`	`+ .Wait();`
	`25`	`+`
	`26`	`+ _sagaData = LoadAggregate<SagaDataAggregate<SoftwareProgrammingSagaData>>(StartMessage.SagaId);`
`22`	`27`	`}`
`23`	`28`
`24`	`29`	`[Then]`
`25`	`30`	`public void Saga_has_correct_data()`
`26`	`31`	`{`
`27`		`- Assert.AreEqual(StartMessage.SofaId, SagaData.Data.SofaId);`
	`32`	`+ Assert.AreEqual(StartMessage.SofaId, _sagaData.Data.SofaId);`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`[Then]`
`31`	`36`	`public void Saga_has_correct_state()`
`32`	`37`	`{`
`33`		`- var saga = new SoftwareProgrammingSaga();`
`34`		`- Assert.AreEqual(saga.Coding.Name, SagaData.Data.CurrentStateName);`
	`38`	`+ Assert.AreEqual(nameof(SoftwareProgrammingSaga.Coding), _sagaData.Data.CurrentStateName);`
`35`	`39`	`}`
`36`	`40`	`}`
`37`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Threading;`
	`3`	`+using GridDomain.CQRS;`
`3`	`4`	`using GridDomain.EventSourcing.Sagas.InstanceSagas;`
	`5`	`+using GridDomain.Node.AkkaMessaging.Waiting;`
	`6`	`+using GridDomain.Tests.Framework;`
	`7`	`+using NUnit.Framework;`
`4`	`8`
`5`	`9`	`namespace GridDomain.Tests.Sagas.InstanceSagas`
`6`	`10`	`{`
`7`		`- class Given_saga_When_publishing_start_messages : SoftwareProgrammingInstanceSagaTest`
	`11`	`+ abstract class Given_saga_When_publishing_start_messages : SoftwareProgrammingInstanceSagaTest`
`8`	`12`	`{`
`9`	`13`	`protected readonly Guid _sagaId;`
`10`	`14`	`private readonly object[] _sagaMessages;`
`@@ -15,17 +19,21 @@ public Given_saga_When_publishing_start_messages(Guid sagaId, params object[] me`
`15`	`19`	`{`
`16`	`20`	`_sagaMessages = messages;`
`17`	`21`	`_sagaId = sagaId;`
`18`		`-`
`19`	`22`	`}`
`20`		`-`
	`23`	`+`
	`24`	`+ [OneTimeSetUp]`
`21`	`25`	`public void When_publishing_start_message()`
`22`	`26`	`{`
`23`		`- foreach(var msg in _sagaMessages)`
`24`		`- GridNode.Transport.Publish(msg);`
	`27`	`+ var waiter = GridNode.NewDebugWaiter(Timeout);`
`25`	`28`
`26`		`- Thread.Sleep(Timeout);`
	`29`	`+ ConfigureWait(waiter)`
	`30`	`+ .Create()`
	`31`	`+ .Publish(_sagaMessages)`
	`32`	`+ .Wait();`
`27`	`33`
`28`	`34`	`SagaData = LoadAggregate<SagaDataAggregate<SoftwareProgrammingSagaData>>(_sagaId);`
`29`	`35`	`}`
	`36`	`+`
	`37`	`+ protected abstract IExpectBuilder<AnyMessagePublisher> ConfigureWait(IMessageWaiter<AnyMessagePublisher> waiter);`
`30`	`38`	`}`
`31`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected override IContainerConfiguration CreateConfiguration()`
`37`	`37`	`);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public SoftwareProgrammingInstanceSagaTest(bool inMemory = true) : base(inMemory)`
	`40`	`+ protected SoftwareProgrammingInstanceSagaTest(bool inMemory = true) : base(inMemory)`
`41`	`41`	`{`
`42`	`42`	`}`
`43`	`43`	`}`