Refactored test helpers to remove TestSupport and move its functionality into OpenIdTestBase.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs b/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs
index e0fac9e..948cd1a 100644
--- a/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/ChannelElements/ExtensionsBindingElementTests.cs
@@ -32,7 +32,7 @@ namespace DotNetOpenAuth.Test.OpenId.ChannelElements {
 			this.factory = new OpenIdExtensionFactory();
 			this.factory.RegisterExtension(MockOpenIdExtension.Factory);
 			this.rpElement = new ExtensionsBindingElement(this.factory, new RelyingPartySecuritySettings());
-			this.request = new SignedResponseRequest(Protocol.Default.Version, OpenIdTestBase.ProviderUri, AuthenticationRequestMode.Immediate);
+			this.request = new SignedResponseRequest(Protocol.Default.Version, OpenIdTestBase.OPUri, AuthenticationRequestMode.Immediate);
 		}
 
 		[TestMethod]
@@ -60,7 +60,7 @@ namespace DotNetOpenAuth.Test.OpenId.ChannelElements {
 		/// </summary>
 		[TestMethod]
 		public void PrepareMessageForSendingNonExtendableMessage() {
-			IProtocolMessage request = new AssociateDiffieHellmanRequest(Protocol.Default.Version, OpenIdTestBase.ProviderUri);
+			IProtocolMessage request = new AssociateDiffieHellmanRequest(Protocol.Default.Version, OpenIdTestBase.OPUri);
 			Assert.IsFalse(this.rpElement.PrepareMessageForSending(request));
 		}
 
@@ -178,7 +178,7 @@ namespace DotNetOpenAuth.Test.OpenId.ChannelElements {
 			ErrorUtilities.VerifyArgumentNotNull(protocol, "protocol");
 
 			IndirectSignedResponse response = new IndirectSignedResponse(protocol.Version, RPUri);
-			response.ProviderEndpoint = ProviderUri;
+			response.ProviderEndpoint = OPUri;
 			response.Extensions.Add(new MockOpenIdExtension("pv", "ev"));
 			return response;
 		}
diff --git a/src/DotNetOpenAuth.Test/OpenId/ChannelElements/SigningBindingElementTests.cs b/src/DotNetOpenAuth.Test/OpenId/ChannelElements/SigningBindingElementTests.cs
index 2f5ddff..78b96e6 100644
--- a/src/DotNetOpenAuth.Test/OpenId/ChannelElements/SigningBindingElementTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/ChannelElements/SigningBindingElementTests.cs
@@ -30,9 +30,9 @@ namespace DotNetOpenAuth.Test.OpenId.ChannelElements {
 			store.StoreAssociation(AssociationRelyingPartyType.Smart, association);
 			SigningBindingElement signer = new SigningBindingElement(store, settings);
 
-			IndirectSignedResponse message = new IndirectSignedResponse(protocol.Version, RPUri);
+			IndirectSignedResponse message = new IndirectSignedResponse(protocol.Version, new Uri("http://rp"));
 			ITamperResistantOpenIdMessage signedMessage = message;
-			message.ProviderEndpoint = ProviderUri;
+			message.ProviderEndpoint = new Uri("http://provider");
 			signedMessage.UtcCreationDate = DateTime.Parse("1/1/2009");
 			signedMessage.AssociationHandle = association.Handle;
 			Assert.IsTrue(signer.PrepareMessageForSending(message));
@@ -48,7 +48,7 @@ namespace DotNetOpenAuth.Test.OpenId.ChannelElements {
 			SigningBindingElement sbe = new SigningBindingElement(new AssociationMemoryStore<AssociationRelyingPartyType>(), new ProviderSecuritySettings());
 			IndirectSignedResponse response = new IndirectSignedResponse(protocol.Version, RPUri);
 			response.ReturnTo = RPUri;
-			response.ProviderEndpoint = ProviderUri;
+			response.ProviderEndpoint = OPUri;
 
 			response.ExtraData["someunsigned"] = "value";
 			response.ExtraData["openid.somesigned"] = "value";