Changeset 13355

Timestamp:

11/24/15 12:49:34 (9 years ago)

Author:

jkarder

Message:

#2258: updated unit test utils

Location:

branches/Async/HeuristicLab.Tests

Files:

• HeuristicLab-3.3/Samples/SamplesUtils.cs (modified) (2 diffs)
• HeuristicLab.Scripting-3.3/ScriptingUtils.cs (modified) (2 diffs)

branches/Async/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs

@@ -1 +1 @@
 using System;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Algorithms.ALPS;
 using HeuristicLab.Algorithms.EvolutionStrategy;
@@ -18 +17 @@
 
     public static void RunAlgorithm(IAlgorithm a) {
-      var trigger = new EventWaitHandle(false, EventResetMode.ManualReset);
       Exception ex = null;
-      a.Stopped += (src, e) => { trigger.Set(); };
-      a.ExceptionOccurred += (src, e) => { ex = e.Value; trigger.Set(); };
+      a.ExceptionOccurred += (sender, e) => { ex = e.Value; };
       a.Prepare();
       a.Start();
-      trigger.WaitOne();
-
-      Assert.AreEqual(ex, null);
+      Assert.IsNull(ex);
     }
 

branches/Async/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/ScriptingUtils.cs

@@ -21 +21 @@
 
 using System;
-using System.Threading;
 using HeuristicLab.Scripting;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -33 +32 @@
 
     public static void RunScript(CSharpScript s) {
-      var trigger = new EventWaitHandle(false, EventResetMode.ManualReset);
       Exception ex = null;
-
-      s.ScriptExecutionFinished += (sender, e) => { ex = e.Value; trigger.Set(); };
-      s.ExecuteAsync();
-      trigger.WaitOne();
-
+      s.ScriptExecutionFinished += (sender, e) => { ex = e.Value; };
+      s.Execute();
       Assert.IsNull(ex);
     }