#25 refactor: simplified timeouts

adamralph · Jan 26, 2014 · 4609300 · 4609300
1 parent f22e6cb
commit 4609300
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/src/Xbehave.Sdk.Net40/Step.cs b/src/Xbehave.Sdk.Net40/Step.cs
@@ -23,6 +23,7 @@ public Step(string name, object stepType)
         {
             this.name = name;
             this.stepType = stepType;
+            this.MillisecondsTimeout = -1;
         }
 
         public virtual string Name

diff --git a/src/Xbehave.Sdk.Net40/SyncStep.cs b/src/Xbehave.Sdk.Net40/SyncStep.cs
@@ -57,17 +57,10 @@ public override void Execute()
                     }
                 });
 
-                if (this.MillisecondsTimeout > 0)
+                // NOTE: we do not call the WaitOne(int) overload because it wasn't introduced until .NET 3.5 SP1 and we want to support pre-SP1
+                if (!@event.WaitOne(this.MillisecondsTimeout, false))
                 {
-                    // NOTE: we do not call the WaitOne(int) overload because it wasn't introduced until .NET 3.5 SP1 and we want to support pre-SP1
-                    if (!@event.WaitOne(this.MillisecondsTimeout, false))
-                    {
-                        throw new Xunit.Sdk.TimeoutException(this.MillisecondsTimeout);
-                    }
-                }
-                else
-                {
-                    @event.WaitOne();
+                    throw new Xunit.Sdk.TimeoutException(this.MillisecondsTimeout);
                 }
 
                 if (exception != null)

diff --git a/src/Xbehave.Sdk.Net45/AsyncStep.cs b/src/Xbehave.Sdk.Net45/AsyncStep.cs
@@ -24,20 +24,9 @@ public override void Execute()
         {
             try
             {
-                if (this.MillisecondsTimeout > 0)
+                if (!this.body().Wait(this.MillisecondsTimeout))
                 {
-                    var task = this.body();
-                    var timeout = Task.Delay(this.MillisecondsTimeout);
-                    if (Task.WhenAny(task, timeout).Result == timeout)
-                    {
-                        throw new Xunit.Sdk.TimeoutException(this.MillisecondsTimeout);
-                    }
-
-                    task.Wait();
-                }
-                else
-                {
-                    this.body().Wait();
+                    throw new Xunit.Sdk.TimeoutException(this.MillisecondsTimeout);
                 }
             }
             catch (AggregateException ex)