Registered handlers now overwrite previous ones rather than getting silently appended, never to be invoked.

10 test failures.

1 files changed, 2 insertions, 7 deletions

diff --git a/src/DotNetOpenAuth.Test/TestBase.cs b/src/DotNetOpenAuth.Test/TestBase.cs
index 96ce98d..4758b7d 100644
--- a/src/DotNetOpenAuth.Test/TestBase.cs
+++ b/src/DotNetOpenAuth.Test/TestBase.cs
@@ -131,21 +131,16 @@ namespace DotNetOpenAuth.Test {
 				this.Uri = uri;
 			}
 
-			private Handler(Handler previous, Func<HttpRequestMessage, Task<HttpResponseMessage>> handler)
-				: this(previous.test, previous.Uri) {
-				this.MessageHandler = handler;
-			}
-
 			internal Uri Uri { get; private set; }
 
 			internal Func<HttpRequestMessage, Task<HttpResponseMessage>> MessageHandler { get; private set; }
 
 			internal void By(Func<HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> handler) {
-				this.test.HostFactories.Handlers.Add(new Handler(this, req => handler(req, CancellationToken.None)));
+				this.test.HostFactories.Handlers[this.Uri] = req => handler(req, CancellationToken.None);
 			}
 
 			internal void By(Func<HttpRequestMessage, Task<HttpResponseMessage>> handler) {
-				this.test.HostFactories.Handlers.Add(new Handler(this, handler));
+				this.test.HostFactories.Handlers[this.Uri] = handler;
 			}
 
 			internal void By(Func<HttpRequestMessage, HttpResponseMessage> handler) {