From 1d3ae8350777f9830aa6417e2dd581ad6bce97cd Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Tue, 11 Nov 2014 20:02:27 -0800 Subject: [PATCH] Address PR comments in test code - add missing license headers - make "post" more obvious - use `Assert.IsAssignableFrom()` nit: remove unused `using`s in `HtmlHelperLinkGenerationTest` --- .../Rendering/HtmlHelperFormExtensionsTest.cs | 63 ++++++++----------- .../Rendering/HtmlHelperFormTest.cs | 16 +++-- .../Rendering/HtmlHelperLinkGenerationTest.cs | 6 +- 3 files changed, 36 insertions(+), 49 deletions(-) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormExtensionsTest.cs index 57da9afdc5..07ba5409e0 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormExtensionsTest.cs @@ -1,4 +1,6 @@ - +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System.Collections.Generic; using System.IO; using Moq; @@ -282,15 +284,14 @@ namespace Microsoft.AspNet.Mvc.Rendering null, // actionName null, // controllerName null, // routeValues - FormMethod.Post.ToString().ToLowerInvariant(), + "post", // method null)) // htmlAttributes .Returns(tagBuilder) .Verifiable(); // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -324,8 +325,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -361,8 +361,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -389,15 +388,14 @@ namespace Microsoft.AspNet.Mvc.Rendering null, // actionName null, // controllerName routeValues, - FormMethod.Post.ToString().ToLowerInvariant(), + "post", // method null)) // htmlAttributes .Returns(tagBuilder) .Verifiable(); // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -426,15 +424,14 @@ namespace Microsoft.AspNet.Mvc.Rendering actionName, controllerName, null, // routeValues - FormMethod.Post.ToString().ToLowerInvariant(), + "post", // method null)) // htmlAttributes .Returns(tagBuilder) .Verifiable(); // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -464,15 +461,14 @@ namespace Microsoft.AspNet.Mvc.Rendering actionName, controllerName, routeValues, - FormMethod.Post.ToString().ToLowerInvariant(), + "post", // method null)) // htmlAttributes .Returns(tagBuilder) .Verifiable(); // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -509,8 +505,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -548,8 +543,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -587,8 +581,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -614,15 +607,14 @@ namespace Microsoft.AspNet.Mvc.Rendering htmlHelper.ViewContext, null, // routeName routeValues, - FormMethod.Post.ToString().ToLowerInvariant(), + "post", // method null)) // htmlAttributes .Returns(tagBuilder) .Verifiable(); // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -648,15 +640,14 @@ namespace Microsoft.AspNet.Mvc.Rendering htmlHelper.ViewContext, routeName, null, // routeValues - FormMethod.Post.ToString().ToLowerInvariant(), + "post", // method null)) // htmlAttributes .Returns(tagBuilder) .Verifiable(); // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -684,15 +675,14 @@ namespace Microsoft.AspNet.Mvc.Rendering htmlHelper.ViewContext, routeName, routeValues, - FormMethod.Post.ToString().ToLowerInvariant(), + "post", // method null)) // htmlAttributes .Returns(tagBuilder) .Verifiable(); // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -727,8 +717,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -764,8 +753,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -801,8 +789,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormTest.cs index c172157add..59cbee6b56 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormTest.cs @@ -1,4 +1,6 @@ - +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System.Collections.Generic; using System.IO; using System.Linq; @@ -126,8 +128,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); Assert.NotNull(htmlHelper.ViewContext.HttpContext); @@ -189,8 +190,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -233,8 +233,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); @@ -257,8 +256,7 @@ namespace Microsoft.AspNet.Mvc.Rendering // Guards Assert.NotNull(htmlHelper.ViewContext); - var writer = htmlHelper.ViewContext.Writer as StringWriter; - Assert.NotNull(writer); + var writer = Assert.IsAssignableFrom(htmlHelper.ViewContext.Writer); var builder = writer.GetStringBuilder(); Assert.NotNull(builder); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperLinkGenerationTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperLinkGenerationTest.cs index 3e33b33bfc..7be0857951 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperLinkGenerationTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperLinkGenerationTest.cs @@ -1,6 +1,8 @@ -using System.Linq; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Core; +using System.Linq; using Moq; using Xunit;