2 files changed, 15 insertions, 3 deletions
diff --git a/src/DotNetOpenAuth.Test/OAuth2/MessageFactoryTests.cs b/src/DotNetOpenAuth.Test/OAuth2/MessageFactoryTests.cs
index e31f3b1..f2d9c09 100644
--- a/src/DotNetOpenAuth.Test/OAuth2/MessageFactoryTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth2/MessageFactoryTests.cs
@@ -45,6 +45,17 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 		}
 
 		[TestCase]
+		public void EndUserAuthorizationImplicitRequest() {
+			var fields = new Dictionary<string, string> {
+				{ Protocol.response_type, "token" },
+				{ Protocol.client_id, "abc" },
+				{ Protocol.redirect_uri, "abc" },
+			};
+			IDirectedProtocolMessage request = this.messageFactory.GetNewRequestMessage(this.recipient, fields);
+			Assert.IsInstanceOf(typeof(EndUserAuthorizationImplicitRequest), request);
+		}
+
+		[TestCase]
 		public void EndUserAuthorizationSuccessResponseWithCode() {
 			var fields = new Dictionary<string, string> {
 				{ Protocol.code, "abc" },
diff --git a/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs b/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs
index 6494b13..c91049f 100644
--- a/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs
@@ -30,6 +30,7 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 						Callback = ClientCallback,
 					};
 					var request = client.PrepareRequestUserAuthorization(authState);
+					Assert.AreEqual(EndUserAuthorizationResponseType.AuthorizationCode, request.ResponseType);
 					client.Channel.Respond(request);
 					var incoming = client.Channel.ReadFromRequest();
 					var result = client.ProcessUserAuthorization(authState, incoming);
@@ -59,8 +60,8 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 					var authState = new AuthorizationState {
 						Callback = ClientCallback,
 					};
-					var request = client.PrepareRequestUserAuthorization(authState);
-					request.ResponseType = EndUserAuthorizationResponseType.AccessToken;
+					var request = client.PrepareRequestUserAuthorization(authState, implicitResponseType: true);
+					Assert.AreEqual(EndUserAuthorizationResponseType.AccessToken, request.ResponseType);
 					client.Channel.Respond(request);
 					var incoming = client.Channel.ReadFromRequest();
 					var result = client.ProcessUserAuthorization(authState, incoming);
@@ -69,7 +70,7 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 				},
 				server => {
 					var request = server.ReadAuthorizationRequest();
-					IAccessTokenRequest accessTokenRequest = request;
+					IAccessTokenRequest accessTokenRequest = (EndUserAuthorizationImplicitRequest)request;
 					Assert.IsFalse(accessTokenRequest.ClientAuthenticated);
 					server.ApproveAuthorizationRequest(request, Username);
 				});