Fixing tests for state saga snapshotting

Renamed test state saga state "Working" to "Coding" fpr unification with test instance sagas

Author: andrey.leskov

GridDomain.Domain.Tests/Sagas/StateSagas/CreateSagaGraph.cs

@@ -10,7 +10,7 @@ internal class CreateSagaGraph
         [Test]
         public void GetGraph()
         {
-            var saga = new SoftwareProgrammingSaga(new SoftwareProgrammingSagaState(Guid.NewGuid(),SoftwareProgrammingSaga.States.Working));
+            var saga = new SoftwareProgrammingSaga(new SoftwareProgrammingSagaState(Guid.NewGuid(),SoftwareProgrammingSaga.States.Coding));
             Console.WriteLine(saga.Machine.ToDotGraph());
         }
     }

GridDomain.Domain.Tests/Sagas/StateSagas/SampleSaga/SoftwareProgrammingSaga.cs

@@ -14,7 +14,7 @@ public class SoftwareProgrammingSaga :
         IHandler<CoffeMadeEvent>
     {
 
-        public static readonly ISagaDescriptor Descriptor = new SoftwareProgrammingSaga(new SoftwareProgrammingSagaState(Guid.Empty,States.Working));
+        public static readonly ISagaDescriptor Descriptor = new SoftwareProgrammingSaga(new SoftwareProgrammingSagaState(Guid.Empty,States.Coding));
         public SoftwareProgrammingSaga(SoftwareProgrammingSagaState state) : base(state)
         {
             var gotTiredTriggerTrigger = RegisterEvent<GotTiredEvent>(Triggers.GoForCoffe);
@@ -25,7 +25,7 @@ public SoftwareProgrammingSaga(SoftwareProgrammingSagaState state) : base(state)
             //TODO: refactor this ugly hack! 
             RegisterEvent<BadCoffeMachineRememberedEvent>(Triggers.DummyForSagaStateChange);
 
-            Machine.Configure(States.Working)
+            Machine.Configure(States.Coding)
                    .Permit(Triggers.GoForCoffe, States.MakingCoffee);
 
             Machine.Configure(States.MakingCoffee)
@@ -34,7 +34,7 @@ public SoftwareProgrammingSaga(SoftwareProgrammingSagaState state) : base(state)
                        State.RememberPerson(e.PersonId);
                        Dispatch(new MakeCoffeCommand(e.PersonId, State.CoffeMachineId));
                    })
-                   .Permit(Triggers.FeelWell, States.Working)
+                   .Permit(Triggers.FeelWell, States.Coding)
                    .Permit(Triggers.GoToSleep, States.Sleeping);
 
             Machine.Configure(States.Sleeping)
@@ -47,7 +47,7 @@ public SoftwareProgrammingSaga(SoftwareProgrammingSagaState state) : base(state)
                            State.RememberBadCoffeMachine(e.CoffeMachineId);
                            Dispatch(new GoToWorkCommand(e.ForPersonId));
                        })
-                   .Permit(Triggers.SleepAnough, States.Working);
+                   .Permit(Triggers.SleepAnough, States.Coding);
         }
 
         public void Handle(GotTiredEvent e)
@@ -81,7 +81,7 @@ public enum Triggers
 
         public enum States
         {
-            Working,
+            Coding,
             MakingCoffee,
             Sleeping
         }

GridDomain.Domain.Tests/Sagas/StateSagas/SampleSaga/SoftwareProgrammingSagaFactory.cs

@@ -17,12 +17,12 @@ public SoftwareProgrammingSaga Create(SoftwareProgrammingSagaState message)
         public SoftwareProgrammingSaga Create(GotTiredEvent message)
         {
             return new SoftwareProgrammingSaga(new SoftwareProgrammingSagaState(message.SagaId,
-                SoftwareProgrammingSaga.States.Working));
+                SoftwareProgrammingSaga.States.Coding));
         }
 
         public SoftwareProgrammingSaga Create(Guid id)
         {
-            return new SoftwareProgrammingSaga(new SoftwareProgrammingSagaState(id,SoftwareProgrammingSaga.States.Working));
+            return new SoftwareProgrammingSaga(new SoftwareProgrammingSagaState(id,SoftwareProgrammingSaga.States.Coding));
         }
     }
 }

GridDomain.Domain.Tests/Sagas/StateSagas/SubscriptionRenewSagaStateTransitionTests.cs

@@ -45,7 +45,7 @@ public void When_valid_transition_Then_state_is_changed()
             Given_new_saga_with_state(SoftwareProgrammingSaga.States.MakingCoffee);
             SagaInstance.Handle(new CoffeMadeEvent(Guid.NewGuid(),Guid.NewGuid()));
 
-            Assert.AreEqual(SoftwareProgrammingSaga.States.Working, SagaInstance.DomainState);
+            Assert.AreEqual(SoftwareProgrammingSaga.States.Coding, SagaInstance.DomainState);
         }
     }
 }

GridDomain.Domain.Tests/Sagas/StateSagas/Transitions/Given_AutomatonymousSaga_When_valid_Transitions.cs

@@ -35,7 +35,7 @@ public void State_is_changed()
             var given = new Given_State_SoftareProgramming_Saga(SoftwareProgrammingSaga.States.MakingCoffee);
 
             When_execute_valid_transaction(given.SagaMachine, new CoffeMadeEvent(Guid.NewGuid(), Guid.NewGuid()));
-            Assert.AreEqual(SoftwareProgrammingSaga.States.Working, given.SagaMachine.State.MachineState);
+            Assert.AreEqual(SoftwareProgrammingSaga.States.Coding, given.SagaMachine.State.MachineState);
         }
 
         [Then]
@@ -45,7 +45,7 @@ public void State_is_changed_on_using_non_generic_transit_method()
 
             object msg = new CoffeMadeEvent(Guid.NewGuid(), Guid.NewGuid());
             given.SagaMachine.Transit(msg);
-            Assert.AreEqual(SoftwareProgrammingSaga.States.Working, given.SagaMachine.State.MachineState);
+            Assert.AreEqual(SoftwareProgrammingSaga.States.Coding, given.SagaMachine.State.MachineState);
         }
 
         [Then]
@@ -64,7 +64,7 @@ public void State_transitioned_event_is_raised()
         [Then]
         public void Commands_are_produced()
         {
-            var given = new Given_State_SoftareProgramming_Saga(SoftwareProgrammingSaga.States.Working);
+            var given = new Given_State_SoftareProgramming_Saga(SoftwareProgrammingSaga.States.Coding);
 
             var subscriptionExpiredEvent = new GotTiredEvent(Guid.NewGuid());
             When_execute_valid_transaction(given.SagaInstance, subscriptionExpiredEvent);
@@ -75,7 +75,7 @@ public void Commands_are_produced()
         [Then]
         public void SagaData_is_changed_after_transition_by_event_data()
         {
-            var given = new Given_State_SoftareProgramming_Saga(SoftwareProgrammingSaga.States.Working);
+            var given = new Given_State_SoftareProgramming_Saga(SoftwareProgrammingSaga.States.Coding);
             given.SagaDataAggregate.ClearEvents();
 
             var gotTiredEvent = new GotTiredEvent(Guid.NewGuid());

GridDomain.Tests.Acceptance/Snapshots/State_Saga_Should_delete_snapshots_according_to_policy_on_shutdown.cs

@@ -3,6 +3,8 @@
 using Akka.Actor;
 using GridDomain.Common;
 using GridDomain.EventSourcing.Sagas;
+using GridDomain.EventSourcing.Sagas.InstanceSagas;
+using GridDomain.EventSourcing.Sagas.StateSagas;
 using GridDomain.Node.Actors;
 using GridDomain.Node.Configuration.Composition;
 using GridDomain.Tests.Framework;
@@ -45,18 +47,19 @@ public void Given_save_on_each_message_policy_and_keep_2_snapshots()
             _sagaId = Guid.NewGuid();
             var sagaStartEvent = new GotTiredEvent(_sagaId, Guid.NewGuid(), Guid.NewGuid(), _sagaId);
 
-            var waiter = GridNode.NewWaiter()
+            var w = GridNode.NewWaiter()
                                  .Expect<SagaCreatedEvent<SoftwareProgrammingSaga.States>>()
                                  .Create();
 
             Publisher.Publish(sagaStartEvent);
-            waiter.Wait();
+            w.Wait();
 
             var sagaActorRef = LookupStateSagaActor<SoftwareProgrammingSaga, SoftwareProgrammingSagaState>(_sagaId);
-
+            Watch(sagaActorRef);
             sagaActorRef.Tell(new NotifyOnPersistenceEvents(TestActor), TestActor);
 
 
+
             var sagaContinueEventA = new CoffeMakeFailedEvent(_sagaId,
                                                              sagaStartEvent.PersonId,
                                                              BusinessDateTime.UtcNow,
@@ -66,9 +69,15 @@ public void Given_save_on_each_message_policy_and_keep_2_snapshots()
                                                         sagaStartEvent.LovelySofaId,
                                                         _sagaId);
 
+            var waiter = GridNode.NewWaiter()
+                                 .Expect<SagaTransitionEvent<SoftwareProgrammingSaga.States, SoftwareProgrammingSaga.Triggers>>(e => e.State == SoftwareProgrammingSaga.States.Coding)
+                                 .And<SagaTransitionEvent<SoftwareProgrammingSaga.States, SoftwareProgrammingSaga.Triggers>>(e => e.State == SoftwareProgrammingSaga.States.Sleeping)
+                                 .Create();
+
             Publisher.Publish(sagaContinueEventA, sagaContinueEventB);
 
-            Watch(sagaActorRef);
+            waiter.Wait();
+
             sagaActorRef.Tell(GracefullShutdownRequest.Instance, TestActor);
 
             FishForMessage<Terminated>(m => true);
@@ -93,7 +102,7 @@ public void Restored_aggregates_should_have_same_ids()
         [Test]
         public void Last_Snapshots_should_have_coding_state_from_last_event()
         {
-            Assert.AreEqual(SoftwareProgrammingSaga.States.Working,_snapshots.Last().Aggregate.MachineState);
+            Assert.AreEqual(SoftwareProgrammingSaga.States.Coding, _snapshots.Last().Aggregate.MachineState);
         }
 
         [Test]