add loaded events to IExtension method Loaded(..) for Sync SM

appccelerate · Oct 3, 2019 · 6bf0099 · 6bf0099
1 parent 25ff0fc
commit 6bf0099
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 12 deletions.
diff --git a/source/Appccelerate.StateMachine.Facts/Machine/ActivePassiveStateMachineTest.cs b/source/Appccelerate.StateMachine.Facts/Machine/ActivePassiveStateMachineTest.cs
@@ -339,7 +339,8 @@ public void SetsCurrentStateOnLoadingFromPersistedState(string dummyName, Func<S
                             .Matches(currentState =>
                                 currentState.IsInitialized
                                 && currentState.ExtractOrThrow() == States.C),
-                        A<IReadOnlyDictionary<States, States>>.Ignored))
+                        A<IReadOnlyDictionary<States, States>>.Ignored,
+                        A<IReadOnlyCollection<EventInformation<Events>>>.Ignored))
                 .MustHaveHappenedOnceExactly();
         }
 
@@ -393,6 +394,7 @@ public void SetsHistoryStatesOnLoadingFromPersistedState()
         public void SetsEventsOnLoadingFromPersistedState(string dummyName, Func<StateMachineDefinition<States, Events>, IStateMachine<States, Events>> createStateMachine)
         {
             var enteredB = false;
+            var extension = A.Fake<IExtension<States, Events>>();
 
             var stateMachineDefinitionBuilder = new StateMachineDefinitionBuilder<States, Events>();
             stateMachineDefinitionBuilder
@@ -406,18 +408,30 @@ public void SetsEventsOnLoadingFromPersistedState(string dummyName, Func<StateMa
                 .WithInitialState(States.A)
                 .Build();
             var testee = createStateMachine(stateMachineDefinition);
+            testee.AddExtension(extension);
 
             var loader = A.Fake<IStateMachineLoader<States, Events>>();
 
+            var eventInformation = new EventInformation<Events>(Events.E, null);
             A.CallTo(() => loader.LoadEvents())
-                .Returns(new List<EventInformation<Events>> { new EventInformation<Events>(Events.E, null) });
+                .Returns(new List<EventInformation<Events>> { eventInformation });
             A.CallTo(() => loader.LoadCurrentState())
                 .Returns(Initializable<States>.UnInitialized());
 
             testee.Load(loader);
 
+            A.CallTo(() => extension.Loaded(
+                    A<IStateMachineInformation<States, Events>>.Ignored,
+                    A<Initializable<States>>.Ignored,
+                    A<IReadOnlyDictionary<States, States>>.Ignored,
+                    A<IReadOnlyCollection<EventInformation<Events>>>
+                        .That
+                        .Matches(c =>
+                            c.Count == 1
+                            && c.Contains(eventInformation))))
+                .MustHaveHappenedOnceExactly();
+
             var signal = new AutoResetEvent(false);
-            var extension = A.Fake<IExtension<States, Events>>();
             A.CallTo(() =>
                     extension.EnteredInitialState(
                         A<IStateMachineInformation<States, Events>>.Ignored,

diff --git a/source/Appccelerate.StateMachine.Specs/Sync/Persisting.cs b/source/Appccelerate.StateMachine.Specs/Sync/Persisting.cs
@@ -353,7 +353,8 @@ public class FakeExtension : ExtensionBase<State, Event>
             public override void Loaded(
                 IStateMachineInformation<State, Event> stateMachineInformation,
                 IInitializable<State> loadedCurrentState,
-                IReadOnlyDictionary<State, State> loadedHistoryStates)
+                IReadOnlyDictionary<State, State> loadedHistoryStates,
+                IReadOnlyCollection<EventInformation<Event>> events)
             {
                 this.LoadedCurrentState.Add(loadedCurrentState);
             }

diff --git a/source/Appccelerate.StateMachine/ActiveStateMachine.cs b/source/Appccelerate.StateMachine/ActiveStateMachine.cs
@@ -219,7 +219,8 @@ void NotifyExtensions()
                 this.stateContainer.Extensions.ForEach(
                     extension => extension.Loaded(
                         loadedCurrentState,
-                        historyStates));
+                        historyStates,
+                        events));
             }
         }
 

diff --git a/source/Appccelerate.StateMachine/Extensions/ExtensionBase.cs b/source/Appccelerate.StateMachine/Extensions/ExtensionBase.cs
@@ -255,7 +255,8 @@ public virtual void EnteringState(
         public virtual void Loaded(
             IStateMachineInformation<TState, TEvent> stateMachineInformation,
             IInitializable<TState> loadedCurrentState,
-            IReadOnlyDictionary<TState, TState> loadedHistoryStates)
+            IReadOnlyDictionary<TState, TState> loadedHistoryStates,
+            IReadOnlyCollection<EventInformation<TEvent>> events)
         {
         }
     }

diff --git a/source/Appccelerate.StateMachine/Extensions/InternalExtension.cs b/source/Appccelerate.StateMachine/Extensions/InternalExtension.cs
@@ -172,9 +172,10 @@ public void ExecutedTransition(
 
         public void Loaded(
             IInitializable<TState> loadedCurrentState,
-            IReadOnlyDictionary<TState, TState> loadedHistoryStates)
+            IReadOnlyDictionary<TState, TState> loadedHistoryStates,
+            IReadOnlyCollection<EventInformation<TEvent>> events)
         {
-            this.apiExtension.Loaded(this.stateMachineInformation, loadedCurrentState, loadedHistoryStates);
+            this.apiExtension.Loaded(this.stateMachineInformation, loadedCurrentState, loadedHistoryStates, events);
         }
 
         public void EnteringState(IStateDefinition<TState, TEvent> stateDefinition, ITransitionContext<TState, TEvent> context)

diff --git a/source/Appccelerate.StateMachine/Extensions/InternalExtensionBase.cs b/source/Appccelerate.StateMachine/Extensions/InternalExtensionBase.cs
@@ -141,7 +141,8 @@ public virtual void ExecutedTransition(
 
         public virtual void Loaded(
             IInitializable<TState> loadedCurrentState,
-            IReadOnlyDictionary<TState, TState> loadedHistoryStates)
+            IReadOnlyDictionary<TState, TState> loadedHistoryStates,
+            IReadOnlyCollection<EventInformation<TEvent>> events)
         {
         }
 

diff --git a/source/Appccelerate.StateMachine/Machine/IExtension.cs b/source/Appccelerate.StateMachine/Machine/IExtension.cs
@@ -252,6 +252,7 @@ void EnteringState(
         void Loaded(
             IStateMachineInformation<TState, TEvent> stateMachineInformation,
             IInitializable<TState> loadedCurrentState,
-            IReadOnlyDictionary<TState, TState> loadedHistoryStates);
+            IReadOnlyDictionary<TState, TState> loadedHistoryStates,
+            IReadOnlyCollection<EventInformation<TEvent>> events);
     }
 }
diff --git a/source/Appccelerate.StateMachine/Machine/IExtensionInternal.cs b/source/Appccelerate.StateMachine/Machine/IExtensionInternal.cs
@@ -102,7 +102,8 @@ void ExecutedTransition(
 
         void Loaded(
             IInitializable<TState> loadedCurrentState,
-            IReadOnlyDictionary<TState, TState> loadedHistoryStates);
+            IReadOnlyDictionary<TState, TState> loadedHistoryStates,
+            IReadOnlyCollection<EventInformation<TEvent>> events);
 
         void EnteringState(
             IStateDefinition<TState, TEvent> stateDefinition,

diff --git a/source/Appccelerate.StateMachine/PassiveStateMachine.cs b/source/Appccelerate.StateMachine/PassiveStateMachine.cs
@@ -289,7 +289,8 @@ void NotifyExtensions()
                 this.stateContainer.Extensions.ForEach(
                     extension => extension.Loaded(
                         loadedCurrentState,
-                        historyStates));
+                        historyStates,
+                        events));
             }
         }