Some StyleCop fixes for ASP.NET team's contribution.

1 files changed, 129 insertions, 142 deletions

diff --git a/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs b/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs
index 6c14927..bec7f8a 100644
--- a/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs
+++ b/src/DotNetOpenAuth.AspNet.Test/OAuthClientTest.cs
@@ -1,143 +1,130 @@
-using System;
-using System.Web;
-using DotNetOpenAuth.Messaging;
-using DotNetOpenAuth.OAuth.Messages;
-using DotNetOpenAuth.AspNet.Clients;
-using Moq;
-using NUnit.Framework;
-using DotNetOpenAuth.AspNet;
-
-namespace DotNetOpenAuth.AspNet.Test
-{
-    [TestFixture]
-    public class OAuthClientTest
-    {
-        [TestCase]
-        public void TestProviderNamePropertyIsCorrect()
-        {
-            // Arrange
-            var client = new MockOAuthClient();
-
-            // Act
-            var provider = client.ProviderName;
-
-            // Assert
-            Assert.AreEqual("mockoauth", provider);
-        }
-
-        [TestCase]
-        public void RequestAuthenticationInvokeMethodOnWebWorker()
-        {
-            // Arrange
-            var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
-            webWorker.Setup(
-                        w => w.RequestAuthentication(
-                            It.Is<Uri>(u => u.ToString().Equals("http://live.com/my/path.cshtml?q=one"))))
-                     .Verifiable();
-
-            var client = new MockOAuthClient(webWorker.Object);
-            var returnUri = new Uri("http://live.com/my/path.cshtml?q=one");
-            var context = new Mock<HttpContextBase>();
-
-            // Act
-            client.RequestAuthentication(context.Object, returnUri);
-
-            // Assert
-            webWorker.Verify();
-        }
-
-        [TestCase]
-        public void VerifyAuthenticationFailsIfResponseTokenIsNull()
-        {
-            // Arrange
-            var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
-            webWorker.Setup(w => w.ProcessUserAuthorization()).Returns((AuthorizedTokenResponse)null);
-
-            var client = new MockOAuthClient(webWorker.Object);
-            var context = new Mock<HttpContextBase>();
-
-            // Act
-            client.VerifyAuthentication(context.Object);
-
-            // Assert
-            webWorker.Verify();
-        }
-
-        [TestCase]
-        public void VerifyAuthenticationFailsIfAccessTokenIsInvalid()
-        {
-            // Arrange
-            var endpoint = new MessageReceivingEndpoint("http://live.com/path/?a=b", HttpDeliveryMethods.GetRequest);
-            var request = new AuthorizedTokenRequest(endpoint, new Version("1.0"));
-            var response = new AuthorizedTokenResponse(request)
-            {
-                AccessToken = "invalid token"
-            };
-
-            var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
-            webWorker.Setup(w => w.ProcessUserAuthorization()).Returns(response).Verifiable();
-
-            var client = new MockOAuthClient(webWorker.Object);
-            var context = new Mock<HttpContextBase>();
-
-            // Act
-            AuthenticationResult result = client.VerifyAuthentication(context.Object);
-
-            // Assert
-            webWorker.Verify();
-
-            Assert.False(result.IsSuccessful);
-        }
-
-        [TestCase]
-        public void VerifyAuthenticationSucceeds()
-        {
-            // Arrange
-            var endpoint = new MessageReceivingEndpoint("http://live.com/path/?a=b", HttpDeliveryMethods.GetRequest);
-            var request = new AuthorizedTokenRequest(endpoint, new Version("1.0"));
-            var response = new AuthorizedTokenResponse(request)
-                               {
-                                   AccessToken = "ok"
-                               };
-
-            var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
-            webWorker.Setup(w => w.ProcessUserAuthorization()).Returns(response).Verifiable();
-
-            var client = new MockOAuthClient(webWorker.Object);
-            var context = new Mock<HttpContextBase>();
-
-            // Act
-            AuthenticationResult result = client.VerifyAuthentication(context.Object);
-
-            // Assert
-            webWorker.Verify();
-
-            Assert.True(result.IsSuccessful);
-            Assert.AreEqual("mockoauth", result.Provider);
-            Assert.AreEqual("12345", result.ProviderUserId);
-            Assert.AreEqual("super", result.UserName);
-        }
-
-        private class MockOAuthClient : OAuthClient
-        {
-            public MockOAuthClient()
-                : this(new Mock<IOAuthWebWorker>().Object)
-            {
-            }
-
-            public MockOAuthClient(IOAuthWebWorker worker) : base("mockoauth", worker)
-            {
-            }
-
-            protected override AuthenticationResult VerifyAuthenticationCore(AuthorizedTokenResponse response)
-            {
-                if (response.AccessToken == "ok")
-                {
-                    return new AuthenticationResult(true, "mockoauth", "12345", "super", response.ExtraData);
-                }
-
-                return AuthenticationResult.Failed;
-            }
-        }
-    }
+namespace DotNetOpenAuth.AspNet.Test {
+	using System;
+	using System.Web;
+	using DotNetOpenAuth.Messaging;
+	using DotNetOpenAuth.OAuth.Messages;
+	using DotNetOpenAuth.AspNet.Clients;
+	using Moq;
+	using NUnit.Framework;
+	using DotNetOpenAuth.AspNet;
+
+	[TestFixture]
+	public class OAuthClientTest {
+		[TestCase]
+		public void TestProviderNamePropertyIsCorrect() {
+			// Arrange
+			var client = new MockOAuthClient();
+
+			// Act
+			var provider = client.ProviderName;
+
+			// Assert
+			Assert.AreEqual("mockoauth", provider);
+		}
+
+		[TestCase]
+		public void RequestAuthenticationInvokeMethodOnWebWorker() {
+			// Arrange
+			var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
+			webWorker.Setup(
+						w => w.RequestAuthentication(
+							It.Is<Uri>(u => u.ToString().Equals("http://live.com/my/path.cshtml?q=one"))))
+					 .Verifiable();
+
+			var client = new MockOAuthClient(webWorker.Object);
+			var returnUri = new Uri("http://live.com/my/path.cshtml?q=one");
+			var context = new Mock<HttpContextBase>();
+
+			// Act
+			client.RequestAuthentication(context.Object, returnUri);
+
+			// Assert
+			webWorker.Verify();
+		}
+
+		[TestCase]
+		public void VerifyAuthenticationFailsIfResponseTokenIsNull() {
+			// Arrange
+			var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
+			webWorker.Setup(w => w.ProcessUserAuthorization()).Returns((AuthorizedTokenResponse)null);
+
+			var client = new MockOAuthClient(webWorker.Object);
+			var context = new Mock<HttpContextBase>();
+
+			// Act
+			client.VerifyAuthentication(context.Object);
+
+			// Assert
+			webWorker.Verify();
+		}
+
+		[TestCase]
+		public void VerifyAuthenticationFailsIfAccessTokenIsInvalid() {
+			// Arrange
+			var endpoint = new MessageReceivingEndpoint("http://live.com/path/?a=b", HttpDeliveryMethods.GetRequest);
+			var request = new AuthorizedTokenRequest(endpoint, new Version("1.0"));
+			var response = new AuthorizedTokenResponse(request) {
+				AccessToken = "invalid token"
+			};
+
+			var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
+			webWorker.Setup(w => w.ProcessUserAuthorization()).Returns(response).Verifiable();
+
+			var client = new MockOAuthClient(webWorker.Object);
+			var context = new Mock<HttpContextBase>();
+
+			// Act
+			AuthenticationResult result = client.VerifyAuthentication(context.Object);
+
+			// Assert
+			webWorker.Verify();
+
+			Assert.False(result.IsSuccessful);
+		}
+
+		[TestCase]
+		public void VerifyAuthenticationSucceeds() {
+			// Arrange
+			var endpoint = new MessageReceivingEndpoint("http://live.com/path/?a=b", HttpDeliveryMethods.GetRequest);
+			var request = new AuthorizedTokenRequest(endpoint, new Version("1.0"));
+			var response = new AuthorizedTokenResponse(request) {
+				AccessToken = "ok"
+			};
+
+			var webWorker = new Mock<IOAuthWebWorker>(MockBehavior.Strict);
+			webWorker.Setup(w => w.ProcessUserAuthorization()).Returns(response).Verifiable();
+
+			var client = new MockOAuthClient(webWorker.Object);
+			var context = new Mock<HttpContextBase>();
+
+			// Act
+			AuthenticationResult result = client.VerifyAuthentication(context.Object);
+
+			// Assert
+			webWorker.Verify();
+
+			Assert.True(result.IsSuccessful);
+			Assert.AreEqual("mockoauth", result.Provider);
+			Assert.AreEqual("12345", result.ProviderUserId);
+			Assert.AreEqual("super", result.UserName);
+		}
+
+		private class MockOAuthClient : OAuthClient {
+			public MockOAuthClient()
+				: this(new Mock<IOAuthWebWorker>().Object) {
+			}
+
+			public MockOAuthClient(IOAuthWebWorker worker)
+				: base("mockoauth", worker) {
+			}
+
+			protected override AuthenticationResult VerifyAuthenticationCore(AuthorizedTokenResponse response) {
+				if (response.AccessToken == "ok") {
+					return new AuthenticationResult(true, "mockoauth", "12345", "super", response.ExtraData);
+				}
+
+				return AuthenticationResult.Failed;
+			}
+		}
+	}
 }