Non-recursive Unwrap.

drunkcod · May 14, 2015 · 7daf3ca · 7daf3ca
1 parent 740e462
commit 7daf3ca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/Source/Core/ConeTestFailure.cs b/Source/Core/ConeTestFailure.cs
@@ -75,17 +75,20 @@ public void WriteTo(ISessionWriter writer) {
 		}
 
 		public static Exception Unwrap(Exception error) {
-			var invocationException = error as TargetInvocationException;
-			if(invocationException != null)
-				return Unwrap(invocationException.InnerException);
-			var innerExceptionsProp = error.GetType().GetProperty("InnerExceptions", BindingFlags.Instance | BindingFlags.Public);
-			if(innerExceptionsProp == null)
-				return error;
-			var innerExceptions = innerExceptionsProp.GetValue(error, null) as ICollection<Exception>;
-			if(innerExceptions != null && innerExceptions.Count == 1)
-				return Unwrap(innerExceptions.First());
+			for(;;) {
+				var invocationException = error as TargetInvocationException;
+				if(invocationException != null)
+					error = invocationException.InnerException;
 
-			return error;
+				var innerExceptionsProp = error.GetType().GetProperty("InnerExceptions", BindingFlags.Instance | BindingFlags.Public);
+				if(innerExceptionsProp == null)
+					return error;
+
+				var innerExceptions = innerExceptionsProp.GetValue(error, null) as ICollection<Exception>;
+				if(innerExceptions != null && innerExceptions.Count == 1)
+					error = innerExceptions.First();
+				else return error;
+			}
 		}
 
 		static IEnumerable<StackFrame> GetNestedStackFrames(Exception e) {

diff --git a/Specs/Cone.Specs/Core/ConeTestFailureSpec.cs b/Specs/Cone.Specs/Core/ConeTestFailureSpec.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 
 namespace Cone.Core
 {
@@ -7,8 +8,12 @@ public class ConeTestFailureSpec
 	{
 		public void Unwraps_AggregateException_with_single_error() {
 			var inner = new Exception();
-
 			Check.That(() => ConeTestFailure.Unwrap(new AggregateException(inner)) == inner);		
 		}
+
+		public void Unwraps_TargetInvoationException() {
+			var inner = new Exception();
+			Check.That(() => ConeTestFailure.Unwrap(new TargetInvocationException(inner)) == inner);		
+		}
 	}
 }