tests

danielgerlag · danielgerlag · commit 5248a4799ac6 · 2017-06-03T20:43:32.000-07:00
diff --git a/src/WorkflowCore/Interface/IWorkflowHost.cs b/src/WorkflowCore/Interface/IWorkflowHost.cs
@@ -9,8 +9,8 @@ namespace WorkflowCore.Interface
 {
     public interface IWorkflowHost
     {
-        Task Start();
-        Task Stop();
+        void Start();
+        void Stop();
         Task<string> StartWorkflow(string workflowId, object data = null);
         Task<string> StartWorkflow(string workflowId, int? version, object data = null);
         Task<string> StartWorkflow<TData>(string workflowId, TData data = null) where TData : class;
diff --git a/src/WorkflowCore/Services/WorkflowHost.cs b/src/WorkflowCore/Services/WorkflowHost.cs
@@ -89,11 +89,11 @@ public async Task<string> StartWorkflow<TData>(string workflowId, int? version,
             return id;
         }
 
-        public async Task Start()
+        public void Start()
         {            
             _shutdown = false;
-            await QueueProvider.Start();
-            await LockProvider.Start();
+            QueueProvider.Start().Wait();
+            LockProvider.Start().Wait();
             for (int i = 0; i < Options.ThreadCount; i++)
             {
                 Logger.LogInformation("Starting worker thread #{0}", i);
@@ -113,7 +113,7 @@ public async Task Start()
             poller.Start();
         }
 
-        public async Task Stop()
+        public void Stop()
         {
             _shutdown = true;            
             
@@ -124,8 +124,8 @@ public async Task Stop()
             _workers.Clear();
             Logger.LogInformation("Worker threads stopped");
             
-            await QueueProvider.Stop();
-            await LockProvider.Stop();
+            QueueProvider.Stop();
+            LockProvider.Stop();
         }
         
         public async Task PublishEvent(string eventName, string eventKey, object eventData, DateTime? effectiveDate = null)
diff --git a/src/providers/WorkflowCore.LockProviders.SqlServer/SqlLockProvider.cs b/src/providers/WorkflowCore.LockProviders.SqlServer/SqlLockProvider.cs
@@ -60,12 +60,12 @@ public async Task ReleaseLock(string Id)
                 _logger.LogError($"Unable to release lock for {Id}");
         }
 
-        public void Start()
+        public async Task Start()
         {
-            _connection.Open();
+            await _connection.OpenAsync();
         }
 
-        public void Stop()
+        public async Task Stop()
         {
             _connection.Close();
         }
diff --git a/src/providers/WorkflowCore.Persistence.EntityFramework/Services/EntityFrameworkPersistenceProvider.cs b/src/providers/WorkflowCore.Persistence.EntityFramework/Services/EntityFrameworkPersistenceProvider.cs
@@ -330,13 +330,16 @@ public async Task MarkEventUnprocessed(string id)
 
         public async Task PersistErrors(IEnumerable<ExecutionError> errors)
         {
-            lock (this)
+            if (errors.Count() > 0)
             {
-                foreach (var error in errors)
+                lock (this)
                 {
-                    Set<PersistedExecutionError>().Add(error.ToPersistable());
+                    foreach (var error in errors)
+                    {
+                        Set<PersistedExecutionError>().Add(error.ToPersistable());
+                    }
+                    SaveChanges();
                 }
-                SaveChanges();
             }
         }
     }
diff --git a/src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj b/src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj
@@ -17,7 +17,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.2.4</Version>
+    <Version>1.2.7</Version>
     <Description>Base package for Workflow-core peristence providers using entity framework</Description>
   </PropertyGroup>
 
diff --git a/src/providers/WorkflowCore.Persistence.MongoDB/Services/MongoPersistenceProvider.cs b/src/providers/WorkflowCore.Persistence.MongoDB/Services/MongoPersistenceProvider.cs
@@ -237,7 +237,8 @@ public async Task MarkEventUnprocessed(string id)
 
         public async Task PersistErrors(IEnumerable<ExecutionError> errors)
         {
-            await ExecutionErrors.InsertManyAsync(errors);
+            if (errors.Count() > 0)
+                await ExecutionErrors.InsertManyAsync(errors);
         }
     }
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
diff --git a/src/providers/WorkflowCore.Persistence.MongoDB/WorkflowCore.Persistence.MongoDB.csproj b/src/providers/WorkflowCore.Persistence.MongoDB/WorkflowCore.Persistence.MongoDB.csproj
@@ -17,10 +17,10 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.2.4</Version>
+    <Version>1.2.7</Version>
     <Description>Provides support to persist workflows running on Workflow Core to a MongoDB database.</Description>
-    <AssemblyVersion>1.2.4.0</AssemblyVersion>
-    <FileVersion>1.2.4.0</FileVersion>
+    <AssemblyVersion>1.2.7.0</AssemblyVersion>
+    <FileVersion>1.2.7.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/samples/WorkflowCore.Sample04/Program.cs b/src/samples/WorkflowCore.Sample04/Program.cs
@@ -40,24 +40,22 @@ private static IServiceProvider ConfigureServices()
             //setup dependency injection
             IServiceCollection services = new ServiceCollection();
             services.AddLogging();
-            //services.AddWorkflow();
+            services.AddWorkflow();
             //services.AddWorkflow(x => x.UseMongoDB(@"mongodb://localhost:27017", "workflow"));
             //services.AddWorkflow(x => x.UseSqlServer(@"Server=.\SQLEXPRESS;Database=WorkflowCore;Trusted_Connection=True;", true, true));
             //services.AddWorkflow(x => x.UsePostgreSQL(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;", true, true));
             //services.AddWorkflow(x => x.UseSqlite(@"Data Source=database.db;", true));            
 
-            services.AddWorkflow(x =>
-            {
-                x.UseAzureSyncronization(@"UseDevelopmentStorage=true");
-                x.UseThreads(1);
-            });
+            //services.AddWorkflow(x =>
+            //{
+            //    x.UseAzureSyncronization(@"UseDevelopmentStorage=true");
+            //    x.UseMongoDB(@"mongodb://localhost:27017", "workflow9999");
+            //});
 
             //redis = ConnectionMultiplexer.Connect("127.0.0.1");
             //services.AddWorkflow(x =>
             //{
             // x.UseMongoDB(@"mongodb://192.168.0.12:27017", "workflow");
-            //x.UseZeroMQLocking(5551, "192.168.0.29:5551".Split(';'));
-            //x.UseZeroMQQueuing(5552, "192.168.0.29:5552".Split(';'));
             //x.UseRabbitMQ(new ConnectionFactory() { HostName = "localhost" });
             //x.UseRedlock(redis);
             //});
diff --git a/src/samples/WorkflowCore.Sample13/Program.cs b/src/samples/WorkflowCore.Sample13/Program.cs
@@ -33,6 +33,11 @@ private static IServiceProvider ConfigureServices()
             //services.AddWorkflow(x => x.UseSqlServer(@"Server=.\SQLEXPRESS;Database=WorkflowCoreTest001;Trusted_Connection=True;", true, true));
             //services.AddWorkflow(x => x.UseSqlite(@"Data Source=wfc001.db;", true));            
 
+            //services.AddWorkflow(x =>
+            //{
+            //    x.UseAzureSyncronization(@"UseDevelopmentStorage=true");
+            //    x.UseMongoDB(@"mongodb://localhost:27017", "workflow-test002");
+            //});
 
             var serviceProvider = services.BuildServiceProvider();
 
diff --git a/src/samples/WorkflowCore.Sample13/WorkflowCore.Sample13.csproj b/src/samples/WorkflowCore.Sample13/WorkflowCore.Sample13.csproj
@@ -12,6 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\providers\WorkflowCore.Persistence.MongoDB\WorkflowCore.Persistence.MongoDB.csproj" />
+    <ProjectReference Include="..\..\providers\WorkflowCore.Providers.Azure\WorkflowCore.Providers.Azure.csproj" />
     <ProjectReference Include="..\..\WorkflowCore\WorkflowCore.csproj" />
   </ItemGroup>
 
diff --git a/test/WorkflowCore.IntegrationTests/Scenarios/ForeachScenario.cs b/test/WorkflowCore.IntegrationTests/Scenarios/ForeachScenario.cs
@@ -67,12 +67,12 @@ public void Scenario()
                 instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
             }
 
-            instance.Status.Should().Be(WorkflowStatus.Complete);
             Step1Ticker.Should().Be(1);
             Step2Ticker.Should().Be(3);
             Step3Ticker.Should().Be(1);
             AfterLoopValue.Should().Be(3);
             CheckSum.Should().Be(7);
+            instance.Status.Should().Be(WorkflowStatus.Complete);
         }
     }
 }
diff --git a/test/WorkflowCore.IntegrationTests/Scenarios/IfScenario.cs b/test/WorkflowCore.IntegrationTests/Scenarios/IfScenario.cs
@@ -82,7 +82,6 @@ public void Scenario()
                 instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
             }
 
-            instance.Status.Should().Be(WorkflowStatus.Complete);
             Step1Ticker.Should().Be(1);
             Step2Ticker.Should().Be(1);
 
@@ -91,6 +90,8 @@ public void Scenario()
             If3Ticker.Should().Be(1);
 
             AfterIfBlock.Should().BeAfter(LastIfBlock);
+
+            instance.Status.Should().Be(WorkflowStatus.Complete);
         }
     }
 }
diff --git a/test/WorkflowCore.IntegrationTests/Scenarios/WhenScenario.cs b/test/WorkflowCore.IntegrationTests/Scenarios/WhenScenario.cs
@@ -78,12 +78,11 @@ public void Scenario()
                 instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
             }
 
-            instance.Status.Should().Be(WorkflowStatus.Complete);
-
             Case1Ticker.Should().Be(0);
             Case2Ticker.Should().Be(1);
             Case3Ticker.Should().Be(1);
             AfterBlock.Should().BeAfter(LastBlock);
+            instance.Status.Should().Be(WorkflowStatus.Complete);
         }
     }
 }
diff --git a/test/WorkflowCore.IntegrationTests/Scenarios/WhileScenario.cs b/test/WorkflowCore.IntegrationTests/Scenarios/WhileScenario.cs
@@ -79,13 +79,13 @@ public void Scenario()
                 counter++;
                 instance = PersistenceProvider.GetWorkflowInstance(workflowId).Result;
             }
-
-            instance.Status.Should().Be(WorkflowStatus.Complete);
+                        
             Step1Ticker.Should().Be(1);
             Step2Ticker.Should().Be(3);
             Step3Ticker.Should().Be(1);
             AfterLoopValue.Should().Be(3);
             AfterWhileBlock.Should().BeAfter(LastWhileBlock);
+            instance.Status.Should().Be(WorkflowStatus.Complete);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace WorkflowCore.Interface`
`9`	`9`	`{`
`10`	`10`	`public interface IWorkflowHost`
`11`	`11`	`{`
`12`		`- Task Start();`
`13`		`- Task Stop();`
	`12`	`+ void Start();`
	`13`	`+ void Stop();`
`14`	`14`	`Task<string> StartWorkflow(string workflowId, object data = null);`
`15`	`15`	`Task<string> StartWorkflow(string workflowId, int? version, object data = null);`
`16`	`16`	`Task<string> StartWorkflow<TData>(string workflowId, TData data = null) where TData : class;`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,11 @@ public async Task<string> StartWorkflow<TData>(string workflowId, int? version,`
`89`	`89`	`return id;`
`90`	`90`	`}`
`91`	`91`
`92`		`- public async Task Start()`
	`92`	`+ public void Start()`
`93`	`93`	`{`
`94`	`94`	`_shutdown = false;`
`95`		`- await QueueProvider.Start();`
`96`		`- await LockProvider.Start();`
	`95`	`+ QueueProvider.Start().Wait();`
	`96`	`+ LockProvider.Start().Wait();`
`97`	`97`	`for (int i = 0; i < Options.ThreadCount; i++)`
`98`	`98`	`{`
`99`	`99`	`Logger.LogInformation("Starting worker thread #{0}", i);`
`@@ -113,7 +113,7 @@ public async Task Start()`
`113`	`113`	`poller.Start();`
`114`	`114`	`}`
`115`	`115`
`116`		`- public async Task Stop()`
	`116`	`+ public void Stop()`
`117`	`117`	`{`
`118`	`118`	`_shutdown = true;`
`119`	`119`
`@@ -124,8 +124,8 @@ public async Task Stop()`
`124`	`124`	`_workers.Clear();`
`125`	`125`	`Logger.LogInformation("Worker threads stopped");`
`126`	`126`
`127`		`- await QueueProvider.Stop();`
`128`		`- await LockProvider.Stop();`
	`127`	`+ QueueProvider.Stop();`
	`128`	`+ LockProvider.Stop();`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`public async Task PublishEvent(string eventName, string eventKey, object eventData, DateTime? effectiveDate = null)`
Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,12 @@ public async Task ReleaseLock(string Id)`
`60`	`60`	`_logger.LogError($"Unable to release lock for {Id}");`
`61`	`61`	`}`
`62`	`62`
`63`		`- public void Start()`
	`63`	`+ public async Task Start()`
`64`	`64`	`{`
`65`		`- _connection.Open();`
	`65`	`+ await _connection.OpenAsync();`
`66`	`66`	`}`
`67`	`67`
`68`		`- public void Stop()`
	`68`	`+ public async Task Stop()`
`69`	`69`	`{`
`70`	`70`	`_connection.Close();`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,13 +330,16 @@ public async Task MarkEventUnprocessed(string id)`
`330`	`330`
`331`	`331`	`public async Task PersistErrors(IEnumerable<ExecutionError> errors)`
`332`	`332`	`{`
`333`		`- lock (this)`
	`333`	`+ if (errors.Count() > 0)`
`334`	`334`	`{`
`335`		`- foreach (var error in errors)`
	`335`	`+ lock (this)`
`336`	`336`	`{`
`337`		`- Set<PersistedExecutionError>().Add(error.ToPersistable());`
	`337`	`+ foreach (var error in errors)`
	`338`	`+ {`
	`339`	`+ Set<PersistedExecutionError>().Add(error.ToPersistable());`
	`340`	`+ }`
	`341`	`+ SaveChanges();`
`338`	`342`	`}`
`339`		`- SaveChanges();`
`340`	`343`	`}`
`341`	`344`	`}`
`342`	`345`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,8 @@ public async Task MarkEventUnprocessed(string id)`
`237`	`237`
`238`	`238`	`public async Task PersistErrors(IEnumerable<ExecutionError> errors)`
`239`	`239`	`{`
`240`		`- await ExecutionErrors.InsertManyAsync(errors);`
	`240`	`+ if (errors.Count() > 0)`
	`241`	`+ await ExecutionErrors.InsertManyAsync(errors);`
`241`	`242`	`}`
`242`	`243`	`}`
`243`	`244`	`#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously`