diff --git a/src/FormFlow/JourneyInstance.cs b/src/FormFlow/JourneyInstance.cs index fe22d37..8406f61 100644 --- a/src/FormFlow/JourneyInstance.cs +++ b/src/FormFlow/JourneyInstance.cs @@ -11,7 +11,6 @@ public class JourneyInstance internal JourneyInstance( IUserInstanceStateProvider stateProvider, - string journeyName, JourneyInstanceId instanceId, Type stateType, object state, @@ -19,7 +18,6 @@ internal JourneyInstance( bool completed = false) { _stateProvider = stateProvider ?? throw new ArgumentNullException(nameof(stateProvider)); - JourneyName = journeyName ?? throw new ArgumentNullException(nameof(journeyName)); StateType = stateType ?? throw new ArgumentNullException(nameof(stateType)); InstanceId = instanceId; Properties = properties ?? PropertiesBuilder.CreateEmpty(); @@ -31,7 +29,7 @@ internal JourneyInstance( public bool Deleted { get; internal set; } - public string JourneyName { get; } + public string JourneyName => InstanceId.JourneyName; public JourneyInstanceId InstanceId { get; } @@ -43,7 +41,6 @@ internal JourneyInstance( public static JourneyInstance Create( IUserInstanceStateProvider stateProvider, - string journeyName, JourneyInstanceId instanceId, Type stateType, object state, @@ -55,7 +52,6 @@ public static JourneyInstance Create( return (JourneyInstance)Activator.CreateInstance( genericType, stateProvider, - journeyName, instanceId, state, properties, @@ -74,7 +70,7 @@ public async Task CompleteAsync() throw new InvalidOperationException("Instance has been deleted."); } - await _stateProvider.CompleteInstanceAsync(JourneyName, InstanceId, StateType); + await _stateProvider.CompleteInstanceAsync(InstanceId, StateType); Completed = true; } @@ -85,7 +81,7 @@ public async Task DeleteAsync() return; } - await _stateProvider.DeleteInstanceAsync(JourneyName, InstanceId, StateType); + await _stateProvider.DeleteInstanceAsync(InstanceId, StateType); Deleted = true; } @@ -122,7 +118,7 @@ protected async Task UpdateStateAsync(object state) throw new InvalidOperationException("Instance has been deleted."); } - await _stateProvider.UpdateInstanceStateAsync(JourneyName, InstanceId, StateType, state); + await _stateProvider.UpdateInstanceStateAsync(InstanceId, StateType, state); State = state; } } @@ -131,12 +127,11 @@ public sealed class JourneyInstance : JourneyInstance { public JourneyInstance( IUserInstanceStateProvider stateProvider, - string journeyName, JourneyInstanceId instanceId, TState state, IReadOnlyDictionary properties, bool completed = false) - : base(stateProvider, journeyName, instanceId, typeof(TState), state!, properties, completed) + : base(stateProvider, instanceId, typeof(TState), state!, properties, completed) { } diff --git a/src/FormFlow/JourneyInstanceProvider.cs b/src/FormFlow/JourneyInstanceProvider.cs index db9a2de..5ec9716 100644 --- a/src/FormFlow/JourneyInstanceProvider.cs +++ b/src/FormFlow/JourneyInstanceProvider.cs @@ -42,13 +42,12 @@ public async Task CreateInstanceAsync( journeyDescriptor, valueProvider); - if (await _stateProvider.GetInstanceAsync(journeyDescriptor.JourneyName, instanceId, journeyDescriptor.StateType) != null) + if (await _stateProvider.GetInstanceAsync(instanceId, journeyDescriptor.StateType) != null) { throw new InvalidOperationException("Instance already exists with this ID."); } return await _stateProvider.CreateInstanceAsync( - journeyDescriptor.JourneyName, instanceId, journeyDescriptor.StateType, state, @@ -73,13 +72,12 @@ public async Task> CreateInstanceAsync( journeyDescriptor, valueProvider); - if (await _stateProvider.GetInstanceAsync(journeyDescriptor.JourneyName, instanceId, journeyDescriptor.StateType) != null) + if (await _stateProvider.GetInstanceAsync(instanceId, journeyDescriptor.StateType) != null) { throw new InvalidOperationException("Instance already exists with this ID."); } return (JourneyInstance)await _stateProvider.CreateInstanceAsync( - journeyDescriptor.JourneyName, instanceId, journeyDescriptor.StateType, state, @@ -286,7 +284,7 @@ public bool IsCurrentInstance(ActionContext actionContext, JourneyInstanceId ins return null; } - var persistedInstance = await _stateProvider.GetInstanceAsync(journeyDescriptor.JourneyName, instanceId.Value, journeyDescriptor.StateType); + var persistedInstance = await _stateProvider.GetInstanceAsync(instanceId.Value, journeyDescriptor.StateType); if (persistedInstance == null) { return null; diff --git a/src/FormFlow/State/IUserInstanceStateProvider.cs b/src/FormFlow/State/IUserInstanceStateProvider.cs index e17291f..95b571d 100644 --- a/src/FormFlow/State/IUserInstanceStateProvider.cs +++ b/src/FormFlow/State/IUserInstanceStateProvider.cs @@ -6,18 +6,17 @@ namespace FormFlow.State; public interface IUserInstanceStateProvider { - Task CompleteInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType); + Task CompleteInstanceAsync(JourneyInstanceId instanceId, Type stateType); Task CreateInstanceAsync( - string journeyName, JourneyInstanceId instanceId, Type stateType, object state, IReadOnlyDictionary? properties); - Task DeleteInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType); + Task DeleteInstanceAsync(JourneyInstanceId instanceId, Type stateType); - Task GetInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType); + Task GetInstanceAsync(JourneyInstanceId instanceId, Type stateType); - Task UpdateInstanceStateAsync(string journeyName, JourneyInstanceId instanceId, Type stateType, object state); + Task UpdateInstanceStateAsync(JourneyInstanceId instanceId, Type stateType, object state); } diff --git a/src/FormFlow/State/SessionUserInstanceStateProvider.cs b/src/FormFlow/State/SessionUserInstanceStateProvider.cs index b64a82b..fb8ae48 100644 --- a/src/FormFlow/State/SessionUserInstanceStateProvider.cs +++ b/src/FormFlow/State/SessionUserInstanceStateProvider.cs @@ -23,13 +23,11 @@ public SessionUserInstanceStateProvider( } public Task CreateInstanceAsync( - string journeyName, JourneyInstanceId instanceId, Type stateType, object state, IReadOnlyDictionary? properties) { - ArgumentNullException.ThrowIfNull(journeyName); ArgumentNullException.ThrowIfNull(stateType); ArgumentNullException.ThrowIfNull(state); @@ -39,7 +37,6 @@ public Task CreateInstanceAsync( var entry = new SessionEntry() { - JourneyName = journeyName, State = serializedState, Properties = properties, Completed = false @@ -47,12 +44,11 @@ public Task CreateInstanceAsync( SetSessionEntry(instanceId, entry); - return Task.FromResult(JourneyInstance.Create(this, journeyName, instanceId, stateType, state, properties)); + return Task.FromResult(JourneyInstance.Create(this, instanceId, stateType, state, properties)); } - public Task CompleteInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType) + public Task CompleteInstanceAsync(JourneyInstanceId instanceId, Type stateType) { - ArgumentNullException.ThrowIfNull(journeyName); ArgumentNullException.ThrowIfNull(stateType); var session = GetSession(); @@ -72,9 +68,8 @@ public Task CompleteInstanceAsync(string journeyName, JourneyInstanceId instance return Task.CompletedTask; } - public Task DeleteInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType) + public Task DeleteInstanceAsync(JourneyInstanceId instanceId, Type stateType) { - ArgumentNullException.ThrowIfNull(journeyName); ArgumentNullException.ThrowIfNull(stateType); var session = GetSession(); @@ -92,9 +87,8 @@ public Task DeleteInstanceAsync(string journeyName, JourneyInstanceId instanceId return Task.CompletedTask; } - public Task GetInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType) + public Task GetInstanceAsync(JourneyInstanceId instanceId, Type stateType) { - ArgumentNullException.ThrowIfNull(journeyName); ArgumentNullException.ThrowIfNull(stateType); var session = GetSession(); @@ -107,7 +101,6 @@ public Task DeleteInstanceAsync(string journeyName, JourneyInstanceId instanceId return Task.FromResult((JourneyInstance?)JourneyInstance.Create( this, - entry.JourneyName, instanceId, stateType, deserializedState, @@ -120,7 +113,7 @@ public Task DeleteInstanceAsync(string journeyName, JourneyInstanceId instanceId } } - public Task UpdateInstanceStateAsync(string journeyName, JourneyInstanceId instanceId, Type stateType, object state) + public Task UpdateInstanceStateAsync(JourneyInstanceId instanceId, Type stateType, object state) { var session = GetSession(); var storeKey = GetKeyForInstance(instanceId); @@ -167,7 +160,6 @@ private static string GetKeyForInstance(string instanceId) => private class SessionEntry { - public string JourneyName { get; set; } = null!; public string State { get; set; } = null!; public IReadOnlyDictionary Properties { get; set; } = null!; public bool Completed { get; set; } diff --git a/test/FormFlow.Tests/EndToEndTests.cs b/test/FormFlow.Tests/EndToEndTests.cs index 246c0be..9de2e70 100644 --- a/test/FormFlow.Tests/EndToEndTests.cs +++ b/test/FormFlow.Tests/EndToEndTests.cs @@ -25,7 +25,6 @@ public async Task ReadState_ReturnsStateAndProperties() { // Arrange var instance = await StateProvider.CreateInstanceAsync( - journeyName: "E2ETests", instanceId: GenerateInstanceId(out var id, out var subid), stateType: typeof(E2ETestsState), state: E2ETestsState.CreateInitialState(), @@ -41,7 +40,6 @@ public async Task UpdateState_UpdatesStateAndRedirects() { // Arrange var instance = await StateProvider.CreateInstanceAsync( - journeyName: "E2ETests", instanceId: GenerateInstanceId(out var id, out var subid), stateType: typeof(E2ETestsState), state: E2ETestsState.CreateInitialState(), @@ -56,7 +54,6 @@ public async Task Complete_DoesNotAllowStateToBeUpdatedSubsequently() { // Arrange var instance = await StateProvider.CreateInstanceAsync( - journeyName: "E2ETests", instanceId: GenerateInstanceId(out var id, out var subid), stateType: typeof(E2ETestsState), state: E2ETestsState.CreateInitialState(), @@ -82,7 +79,6 @@ public async Task Complete_DoesAllowStateToBeReadSubsequently() { // Arrange var instance = await StateProvider.CreateInstanceAsync( - journeyName: "E2ETests", instanceId: GenerateInstanceId(out var id, out var subid), stateType: typeof(E2ETestsState), state: E2ETestsState.CreateInitialState(), @@ -108,7 +104,6 @@ public async Task Delete_ReturnsOk() { // Arrange var instance = await StateProvider.CreateInstanceAsync( - journeyName: "E2ETests", instanceId: GenerateInstanceId(out var id, out var subid), stateType: typeof(E2ETestsState), state: E2ETestsState.CreateInitialState(), diff --git a/test/FormFlow.Tests/Infrastructure/InMemoryInstanceStateProvider.cs b/test/FormFlow.Tests/Infrastructure/InMemoryInstanceStateProvider.cs index 7f9e039..6eb0e78 100644 --- a/test/FormFlow.Tests/Infrastructure/InMemoryInstanceStateProvider.cs +++ b/test/FormFlow.Tests/Infrastructure/InMemoryInstanceStateProvider.cs @@ -11,13 +11,12 @@ public class InMemoryInstanceStateProvider : IUserInstanceStateProvider public InMemoryInstanceStateProvider() { - _instances = new Dictionary(); + _instances = new(); } public void Clear() => _instances.Clear(); public Task CreateInstanceAsync( - string journeyName, JourneyInstanceId instanceId, Type stateType, object state, @@ -25,7 +24,6 @@ public Task CreateInstanceAsync( { _instances.Add(instanceId, new Entry() { - JourneyName = journeyName, StateType = stateType, State = state, Properties = properties @@ -33,7 +31,6 @@ public Task CreateInstanceAsync( var instance = JourneyInstance.Create( this, - journeyName, instanceId, stateType, state, @@ -42,30 +39,30 @@ public Task CreateInstanceAsync( return Task.FromResult(instance); } - public Task CompleteInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType) + public Task CompleteInstanceAsync(JourneyInstanceId instanceId, Type stateType) { _instances[instanceId].Completed = true; return Task.CompletedTask; } - public Task DeleteInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType) + public Task DeleteInstanceAsync(JourneyInstanceId instanceId, Type stateType) { _instances.Remove(instanceId); return Task.CompletedTask; } - public Task GetInstanceAsync(string journeyName, JourneyInstanceId instanceId, Type stateType) + public Task GetInstanceAsync(JourneyInstanceId instanceId, Type stateType) { _instances.TryGetValue(instanceId, out var entry); var instance = entry != null ? - JourneyInstance.Create(this, entry.JourneyName!, instanceId, entry.StateType!, entry.State!, entry.Properties!, entry.Completed) : + JourneyInstance.Create(this, instanceId, entry.StateType!, entry.State!, entry.Properties!, entry.Completed) : null; return Task.FromResult(instance); } - public Task UpdateInstanceStateAsync(string journeyName, JourneyInstanceId instanceId, Type stateType, object state) + public Task UpdateInstanceStateAsync(JourneyInstanceId instanceId, Type stateType, object state) { _instances[instanceId].State = state; return Task.CompletedTask; @@ -73,7 +70,6 @@ public Task UpdateInstanceStateAsync(string journeyName, JourneyInstanceId insta private class Entry { - public string? JourneyName { get; set; } public IReadOnlyDictionary? Properties { get; set; } public object? State { get; set; } public Type? StateType { get; set; } diff --git a/test/FormFlow.Tests/Infrastructure/MvcTestBase.cs b/test/FormFlow.Tests/Infrastructure/MvcTestBase.cs index 766b672..a2899bd 100644 --- a/test/FormFlow.Tests/Infrastructure/MvcTestBase.cs +++ b/test/FormFlow.Tests/Infrastructure/MvcTestBase.cs @@ -46,7 +46,6 @@ protected async Task> CreateInstanceAsync( var instanceStateProvider = Fixture.Services.GetRequiredService(); return (JourneyInstance)await instanceStateProvider.CreateInstanceAsync( - journeyName, instanceId, typeof(TState), state, diff --git a/test/FormFlow.Tests/JourneyInstanceProviderTests.cs b/test/FormFlow.Tests/JourneyInstanceProviderTests.cs index 76b8aa6..a03f528 100644 --- a/test/FormFlow.Tests/JourneyInstanceProviderTests.cs +++ b/test/FormFlow.Tests/JourneyInstanceProviderTests.cs @@ -110,11 +110,10 @@ public async Task CreateInstanceAsync_InstanceAlreadyExists_ThrowsInvalidOperati var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -160,7 +159,6 @@ public async Task CreateInstanceAsync_CreatesInstanceInStateStore() var stateProvider = new Mock(); stateProvider .Setup(mock => mock.CreateInstanceAsync( - journeyName, It.IsAny(), // FIXME stateType, state, @@ -169,7 +167,6 @@ public async Task CreateInstanceAsync_CreatesInstanceInStateStore() .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -283,7 +280,7 @@ public async Task GetInstanceAsync_InstanceDoesNotExist_ReturnsNull() var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync((JourneyInstance?)null); var httpContext = new DefaultHttpContext(); @@ -321,11 +318,10 @@ public async Task GetInstanceAsync_InstanceDoesExist_ReturnsInstance() var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -376,11 +372,10 @@ public async Task GetInstanceOfT_StateTypeIsIncompatible_ThrowsInvalidOperationE var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -445,11 +440,10 @@ public async Task GetOrCreateInstanceAsync_InstanceDoesNotExist_CreatesInstanceI var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync((JourneyInstance?)null); stateProvider .Setup(mock => mock.CreateInstanceAsync( - journeyName, It.IsAny(), // FIXME stateType, It.IsAny(), @@ -458,7 +452,6 @@ public async Task GetOrCreateInstanceAsync_InstanceDoesNotExist_CreatesInstanceI .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -506,7 +499,7 @@ public async Task GetOrCreateInstanceAsync_CreateStateStateTypeIsIncompatible_Th var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync((JourneyInstance?)null); var httpContext = new DefaultHttpContext(); @@ -546,11 +539,10 @@ public async Task GetOrCreateInstanceAsync_InstanceDoesExist_ReturnsExistingInst var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, originalState, @@ -606,7 +598,7 @@ public async Task GetOrCreateInstanceOfT_CreateStateStateTypeIsIncompatible_Thro var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync((JourneyInstance?)null); var httpContext = new DefaultHttpContext(); @@ -647,11 +639,10 @@ public async Task GetOrCreateInstanceFfT_RequestedStateTypeIsIncompatible_Throws var stateProvider = new Mock(); stateProvider - .Setup(mock => mock.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(mock => mock.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -826,11 +817,10 @@ public async Task ResolveCurrentInstanceAsync_CannotExtractIdForRouteValues_Retu var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -898,7 +888,7 @@ public async Task ResolveCurrentInstanceAsync_InstanceDoesNotExistInStateStore_R var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync((JourneyInstance?)null); var httpContext = new DefaultHttpContext(); @@ -933,11 +923,10 @@ public async Task ResolveCurrentInstanceAsync_MismatchingJourneyNames_ReturnsNul var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -978,11 +967,10 @@ public async Task ResolveCurrentInstanceAsync_MismatchingStateType_ReturnsNull() var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -1019,11 +1007,10 @@ public async Task ResolveCurrentInstanceAsync_InstanceExistsForRandomId_ReturnsI var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -1077,11 +1064,10 @@ public async Task ResolveCurrentInstanceAsync_InstanceExistsForRouteValues_Retur var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync( JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -1126,12 +1112,11 @@ public async Task ResolveCurrentInstanceAsync_InstanceIsDeleted_ReturnsFalse() var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync(() => { var instance = JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, @@ -1171,11 +1156,10 @@ public async Task ResolveCurrentInstanceAsync_ReturnsSameObjectWithinSameRequest var stateProvider = new Mock(); stateProvider - .Setup(s => s.GetInstanceAsync(journeyName, instanceId, stateType)) + .Setup(s => s.GetInstanceAsync(instanceId, stateType)) .ReturnsAsync(() => JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, state, diff --git a/test/FormFlow.Tests/JourneyInstanceTests.cs b/test/FormFlow.Tests/JourneyInstanceTests.cs index 84bba33..facee5b 100644 --- a/test/FormFlow.Tests/JourneyInstanceTests.cs +++ b/test/FormFlow.Tests/JourneyInstanceTests.cs @@ -18,12 +18,10 @@ public async Task DeleteAsync_CallsDeleteOnStateProvider() var stateProvider = new Mock(); - var journeyName = "journey"; var stateType = typeof(MyState); var instance = (JourneyInstance)JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, new MyState(), @@ -35,7 +33,7 @@ public async Task DeleteAsync_CallsDeleteOnStateProvider() await instance.DeleteAsync(); // Assert - stateProvider.Verify(mock => mock.DeleteInstanceAsync(journeyName, instanceId, stateType)); + stateProvider.Verify(mock => mock.DeleteInstanceAsync(instanceId, stateType)); } [Fact] @@ -46,12 +44,10 @@ public async Task CompleteAsync_CallsDeleteOnStateProvider() var stateProvider = new Mock(); - var journeyName = "journey"; var stateType = typeof(MyState); var instance = (JourneyInstance)JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, new MyState(), @@ -63,7 +59,7 @@ public async Task CompleteAsync_CallsDeleteOnStateProvider() await instance.CompleteAsync(); // Assert - stateProvider.Verify(mock => mock.CompleteInstanceAsync(journeyName, instanceId, stateType)); + stateProvider.Verify(mock => mock.CompleteInstanceAsync(instanceId, stateType)); } [Fact] @@ -74,12 +70,10 @@ public async Task UpdateStateAsync_DeletedInstance_ThrowsInvalidOperationExcepti var stateProvider = new Mock(); - var journeyName = "journey"; var stateType = typeof(MyState); var instance = (JourneyInstance)JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, new MyState(), @@ -104,12 +98,10 @@ public async Task UpdateStateAsync_CallsUpdateStateOnStateProvider() var stateProvider = new Mock(); - var journeyName = "journey"; var stateType = typeof(MyState); var instance = (JourneyInstance)JourneyInstance.Create( stateProvider.Object, - journeyName, instanceId, stateType, new MyState(), @@ -121,7 +113,7 @@ public async Task UpdateStateAsync_CallsUpdateStateOnStateProvider() await instance.UpdateStateAsync(newState); // Assert - stateProvider.Verify(mock => mock.UpdateInstanceStateAsync(journeyName, instanceId, stateType, newState)); + stateProvider.Verify(mock => mock.UpdateInstanceStateAsync(instanceId, stateType, newState)); Assert.Same(newState, instance.State); }