Exception handling during test class Disposal no longer relies on dep…

…recated uses of ExceptionList objects.
fixie · Aug 5, 2013 · c9d8abc · c9d8abc
1 parent b78f70c
commit c9d8abc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/src/Fixie/Behaviors/CreateInstancePerCase.cs b/src/Fixie/Behaviors/CreateInstancePerCase.cs
@@ -30,9 +30,14 @@ public void Execute(Type testClass, Convention convention, Case[] cases)
                     var fixture = new Fixture(testClass, instance, convention.CaseExecution.Behavior, new[] { @case });
                     convention.InstanceExecution.Behavior.Execute(fixture);
 
-                    var disposalExceptions = Lifecycle.Dispose(instance);
+                    try
-                    if (disposalExceptions.Any())
+                    {
-                        exceptions.Add(disposalExceptions);
+                        Lifecycle.Dispose(instance);
+                    }
+                    catch (Exception disposalException)
+                    {
+                        exceptions.Add(disposalException);
+                    }
                 }
             }
         }

diff --git a/src/Fixie/Behaviors/CreateInstancePerTestClass.cs b/src/Fixie/Behaviors/CreateInstancePerTestClass.cs
@@ -27,11 +27,14 @@ public void Execute(Type testClass, Convention convention, Case[] cases)
                 var fixture = new Fixture(testClass, instance, convention.CaseExecution.Behavior, cases);
                 convention.InstanceExecution.Behavior.Execute(fixture);
 
-                var disposalExceptions = Lifecycle.Dispose(instance);
+                try
-                if (disposalExceptions.Any())
+                {
+                    Lifecycle.Dispose(instance);
+                }
+                catch (Exception disposalException)
                 {
                     foreach (var @case in cases)
-                        @case.Exceptions.Add(disposalExceptions);
+                        @case.Exceptions.Add(disposalException);
                 }
             }
         }

diff --git a/src/Fixie/Behaviors/Lifecycle.cs b/src/Fixie/Behaviors/Lifecycle.cs
@@ -27,22 +27,11 @@ public static ExceptionList Construct(Type type, out object instance)
             return exceptions;
         }
 
-        public static ExceptionList Dispose(object instance)
+        public static void Dispose(object instance)
         {
-            var exceptions = new ExceptionList();
+            var disposable = instance as IDisposable;
-
+            if (disposable != null)
-            try
+                disposable.Dispose();
-            {
-                var disposable = instance as IDisposable;
-                if (disposable != null)
-                    disposable.Dispose();
-            }
-            catch (Exception ex)
-            {
-                exceptions.Add(ex);
-            }
-
-            return exceptions;
         }
     }
 }