end step

Author: Daniel Gerlag

src/WorkflowCore/Interface/IStepBuilder.cs

@@ -85,7 +85,7 @@ public interface IStepBuilder<TData, TStepBody>
         /// Ends the workflow and marks it as complete
         /// </summary>
         /// <returns></returns>
-        //IStepBuilder<TData, TStepBody> EndWorkflow();
+        IStepBuilder<TData, TStepBody> EndWorkflow();
 
         IParentStepBuilder<TData, Foreach> ForEach(Expression<Func<TData, IEnumerable>> collection);
 

src/WorkflowCore/Services/StepBuilder.cs

@@ -141,13 +141,13 @@ private WorkflowStep IterateParents(int id, string name)
             return null;
         }
 
-        //public IStepBuilder<TData, TStepBody> EndWorkflow()
-        //{
-        //    EndStep newStep = new EndStep();
-        //    WorkflowBuilder.AddStep(newStep);
-        //    Step.Outcomes.Add(new StepOutcome() { NextStep = newStep.Id });
-        //    return this;
-        //}
+        public IStepBuilder<TData, TStepBody> EndWorkflow()
+        {
+            EndStep newStep = new EndStep();
+            WorkflowBuilder.AddStep(newStep);
+            Step.Outcomes.Add(new StepOutcome() { NextStep = newStep.Id });
+            return this;
+        }
 
         public IParentStepBuilder<TData, Foreach> ForEach(Expression<Func<TData, IEnumerable>> collection)
         {

test/WorkflowCore.IntegrationTests/Scenarios/EndStepScenario.cs

@@ -8,57 +8,57 @@
 
 namespace WorkflowCore.IntegrationTests.Scenarios
 {
-    //public class EndStepScenario : BaseScenario<EndStepScenario.ScenarioWorkflow, Object>
-    //{        
-    //    internal static int StartStepCounter = 0;
-    //    internal static int MidStepCounter = 0;
-    //    internal static int EndStepCounter = 0;
+    public class EndStepScenario : BaseScenario<EndStepScenario.ScenarioWorkflow, Object>
+    {
+        internal static int StartStepCounter = 0;
+        internal static int MidStepCounter = 0;
+        internal static int EndStepCounter = 0;
 
-    //    public class ScenarioWorkflow : IWorkflow
-    //    {
-    //        public string Id => "EndStepScenario";
-    //        public int Version => 1;
-    //        public void Build(IWorkflowBuilder<Object> builder)
-    //        {
-    //            builder
-    //                .StartWith(context =>
-    //                {
-    //                    StartStepCounter++;
-    //                    return ExecutionResult.Next();
-    //                })
-    //                .While(x => true)
-    //                .Do(x => x
-    //                    .StartWith(context =>
-    //                    {
-    //                        MidStepCounter++;
-    //                        return ExecutionResult.Next();
-    //                    }))
-    //                    .EndWorkflow()
-    //                .Then(context =>
-    //                {
-    //                    EndStepCounter++;
-    //                    return ExecutionResult.Next();
-    //                });
-    //        }
-    //    }
+        public class ScenarioWorkflow : IWorkflow
+        {
+            public string Id => "EndStepScenario";
+            public int Version => 1;
+            public void Build(IWorkflowBuilder<Object> builder)
+            {
+                builder
+                    .StartWith(context =>
+                    {
+                        StartStepCounter++;
+                        return ExecutionResult.Next();
+                    })
+                    .While(x => true)
+                    .Do(x => x
+                        .StartWith(context =>
+                        {
+                            MidStepCounter++;
+                            return ExecutionResult.Next();
+                        })
+                        .EndWorkflow())                        
+                    .Then(context =>
+                    {
+                        EndStepCounter++;
+                        return ExecutionResult.Next();
+                    });
+            }
+        }
 
-    //    [Fact]
-    //    public void Scenario()
-    //    {
-    //        var workflowId = Host.StartWorkflow("EndStepScenario").Result;
-    //        var instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
-    //        int counter = 0;
-    //        while ((instance.Status == WorkflowStatus.Runnable) && (counter < 300))
-    //        {
-    //            System.Threading.Thread.Sleep(100);
-    //            counter++;
-    //            instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
-    //        }
+        [Fact]
+        public void Scenario()
+        {
+            var workflowId = Host.StartWorkflow("EndStepScenario").Result;
+            var instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
+            int counter = 0;
+            while ((instance.Status == WorkflowStatus.Runnable) && (counter < 300))
+            {
+                System.Threading.Thread.Sleep(100);
+                counter++;
+                instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
+            }
 
-    //        instance.Status.Should().Be(WorkflowStatus.Complete);
-    //        StartStepCounter.Should().Be(1);
-    //        MidStepCounter.Should().Be(1);
-    //        EndStepCounter.Should().Be(0);
-    //    }
-    //}
+            instance.Status.Should().Be(WorkflowStatus.Complete);
+            StartStepCounter.Should().Be(1);
+            MidStepCounter.Should().Be(1);
+            EndStepCounter.Should().Be(0);
+        }
+    }
 }