huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Address PR comments in test code 

- add missing license headers
- make "post" more obvious
- use `Assert.IsAssignableFrom()`

nit: remove unused `using`s in `HtmlHelperLinkGenerationTest`
This commit is contained in:
Doug Bunting 2014-11-11 20:02:27 -08:00
parent 6313a9682e
commit 1d3ae83507
3 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormExtensionsTest.cs
View File

@ -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.Collections.Generic;
using System.IO; using System.IO;
using Moq; using Moq;
@ -282,15 +284,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
null, // actionName null, // actionName
null, // controllerName null, // controllerName
null, // routeValues null, // routeValues
FormMethod.Post.ToString().ToLowerInvariant(), "post", // method
null)) // htmlAttributes null)) // htmlAttributes
.Returns(tagBuilder) .Returns(tagBuilder)
.Verifiable(); .Verifiable();
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -324,8 +325,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -361,8 +361,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -389,15 +388,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
null, // actionName null, // actionName
null, // controllerName null, // controllerName
routeValues, routeValues,
FormMethod.Post.ToString().ToLowerInvariant(), "post", // method
null)) // htmlAttributes null)) // htmlAttributes
.Returns(tagBuilder) .Returns(tagBuilder)
.Verifiable(); .Verifiable();
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -426,15 +424,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
actionName, actionName,
controllerName, controllerName,
null, // routeValues null, // routeValues
FormMethod.Post.ToString().ToLowerInvariant(), "post", // method
null)) // htmlAttributes null)) // htmlAttributes
.Returns(tagBuilder) .Returns(tagBuilder)
.Verifiable(); .Verifiable();
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -464,15 +461,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
actionName, actionName,
controllerName, controllerName,
routeValues, routeValues,
FormMethod.Post.ToString().ToLowerInvariant(), "post", // method
null)) // htmlAttributes null)) // htmlAttributes
.Returns(tagBuilder) .Returns(tagBuilder)
.Verifiable(); .Verifiable();
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -509,8 +505,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -548,8 +543,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -587,8 +581,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -614,15 +607,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
htmlHelper.ViewContext, htmlHelper.ViewContext,
null, // routeName null, // routeName
routeValues, routeValues,
FormMethod.Post.ToString().ToLowerInvariant(), "post", // method
null)) // htmlAttributes null)) // htmlAttributes
.Returns(tagBuilder) .Returns(tagBuilder)
.Verifiable(); .Verifiable();
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -648,15 +640,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
htmlHelper.ViewContext, htmlHelper.ViewContext,
routeName, routeName,
null, // routeValues null, // routeValues
FormMethod.Post.ToString().ToLowerInvariant(), "post", // method
null)) // htmlAttributes null)) // htmlAttributes
.Returns(tagBuilder) .Returns(tagBuilder)
.Verifiable(); .Verifiable();
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -684,15 +675,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
htmlHelper.ViewContext, htmlHelper.ViewContext,
routeName, routeName,
routeValues, routeValues,
FormMethod.Post.ToString().ToLowerInvariant(), "post", // method
null)) // htmlAttributes null)) // htmlAttributes
.Returns(tagBuilder) .Returns(tagBuilder)
.Verifiable(); .Verifiable();
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -727,8 +717,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -764,8 +753,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -801,8 +789,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);

16
test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperFormTest.cs
View File

@ -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.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -126,8 +128,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
Assert.NotNull(htmlHelper.ViewContext.HttpContext); Assert.NotNull(htmlHelper.ViewContext.HttpContext);
@ -189,8 +190,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -233,8 +233,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);
@ -257,8 +256,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
// Guards // Guards
Assert.NotNull(htmlHelper.ViewContext); Assert.NotNull(htmlHelper.ViewContext);
var writer = htmlHelper.ViewContext.Writer as StringWriter; var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
Assert.NotNull(writer);
var builder = writer.GetStringBuilder(); var builder = writer.GetStringBuilder();
Assert.NotNull(builder); Assert.NotNull(builder);

6
test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperLinkGenerationTest.cs
View File

@ -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 System.Collections.Generic;
using Microsoft.AspNet.Mvc.Core; using System.Linq;
using Moq; using Moq;
using Xunit; using Xunit;