[FinallyDelegate] make key for lookupTable actually unique (#6)

lewurm · akoeplinger · commit 0dc771677102 · 2018-02-13T00:17:43.000+01:00
Attributes like `[TestCase]` execute the same test method multiple
times, therefore there could be a clash in `lookupTable` when adding
more elements to it.

Use GUID in order to make key for `lookupTable` without doubt unique
diff --git a/NUnitLite-1.0.0/src/framework/FinallyDelegate.cs b/NUnitLite-1.0.0/src/framework/FinallyDelegate.cs
@@ -35,9 +35,9 @@ namespace NUnit.Framework.Internal
 {
 	[Serializable]
 	class Container : ILogicalThreadAffinative {
-		public string testName;
-		public Container(string testName) {
-			this.testName = testName;
+		public Guid guid;
+		public Container(Guid guid) {
+			this.guid = guid;
 		}
 	}
 
@@ -58,29 +58,30 @@ public class FinallyDelegate
 		// so we need a stack of finally delegate continuations
 		Stack<Tuple<TestExecutionContext, long, TestResult>> testStack;
 
-		Dictionary<string, TestResult> lookupTable;
+		Dictionary<Guid, TestResult> lookupTable;
 
 		private static readonly string CONTEXT_KEY = "TestResultName";
 
 		public FinallyDelegate () {
 			this.testStack = new Stack<Tuple<TestExecutionContext, long, TestResult>>();
-			this.lookupTable = new Dictionary<string, TestResult>();
+			this.lookupTable = new Dictionary<Guid, TestResult>();
 		}
 
 		public void Set (TestExecutionContext context, long startTicks, TestResult result) {
 			var frame = new Tuple<TestExecutionContext, long, TestResult>(context, startTicks, result);
 
 			/* keep name in LogicalCallContext, because this will be inherited by
 			 * Threads spawned by the test case */
-			CallContext.SetData(CONTEXT_KEY, new Container(result.Test.FullName));
+			var guid = Guid.NewGuid();
+			CallContext.SetData(CONTEXT_KEY, new Container(guid));
 
-			this.lookupTable.Add(result.Test.FullName, result);
+			this.lookupTable.Add(guid, result);
 			this.testStack.Push(frame);
 		}
 
 		public void HandleUnhandledExc (Exception ex) {
 			Container c = (Container) CallContext.GetData(CONTEXT_KEY);
-			TestResult result = this.lookupTable [c.testName];
+			TestResult result = this.lookupTable [c.guid];
 			result.RecordException(ex);
 			result.ThreadCrashFail = true;
 		}
