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

Enable input, image and url resolution `TagHelper`s to be written as void elements. 

- Razor rendering now understands `TagMode` which allows void elements to be rendered.
- Added a `TagStructure.WithoutEnd` bit to `InputTagHelper`, `ImageTagHelper` and `UrlResolutionTagHelper`. This will allow users to write the various elements in the void format. Used the HTML5 spec to determine the elements appropriate.
- Added tests to ensure `TagMode.StartTagOnly` is rendered properly.
- Updated a few functional tests to showcase the void element formats.

aspnet/Razor#450
This commit is contained in:
N. Taylor Mullen 2015-08-11 12:40:15 -07:00
parent 89a8d0e36c
commit 1b51f6bca6
18 changed files with 278 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
View File

@ -336,7 +336,7 @@ namespace Microsoft.AspNet.Mvc.Razor
} }
} }
if (tagHelperOutput.SelfClosing) if (tagHelperOutput.TagMode == TagMode.SelfClosing)
{ {
writer.Write(" /"); writer.Write(" /");
} }
@ -344,7 +344,7 @@ namespace Microsoft.AspNet.Mvc.Razor
writer.Write('>'); writer.Write('>');
} }
if (isTagNameNullOrWhitespace || !tagHelperOutput.SelfClosing) if (isTagNameNullOrWhitespace || tagHelperOutput.TagMode == TagMode.StartTagAndEndTag)
{ {
WriteTo(writer, tagHelperOutput.PreContent); WriteTo(writer, tagHelperOutput.PreContent);
if (tagHelperOutput.IsContentModified) if (tagHelperOutput.IsContentModified)
@ -364,7 +364,7 @@ namespace Microsoft.AspNet.Mvc.Razor
WriteTo(writer, tagHelperOutput.PostContent); WriteTo(writer, tagHelperOutput.PostContent);
} }
if (!isTagNameNullOrWhitespace && !tagHelperOutput.SelfClosing) if (!isTagNameNullOrWhitespace && tagHelperOutput.TagMode == TagMode.StartTagAndEndTag)
{ {
writer.Write(string.Format(CultureInfo.InvariantCulture, "</{0}>", tagHelperOutput.TagName)); writer.Write(string.Format(CultureInfo.InvariantCulture, "</{0}>", tagHelperOutput.TagName));
} }

19
src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Rendering;
using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers;
@ -21,28 +20,28 @@ namespace Microsoft.AspNet.Mvc.Razor.TagHelpers
[TargetElement("*", Attributes = "itemid")] [TargetElement("*", Attributes = "itemid")]
[TargetElement("a", Attributes = "href")] [TargetElement("a", Attributes = "href")]
[TargetElement("applet", Attributes = "archive")] [TargetElement("applet", Attributes = "archive")]
[TargetElement("area", Attributes = "href")] [TargetElement("area", Attributes = "href", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("audio", Attributes = "src")] [TargetElement("audio", Attributes = "src")]
[TargetElement("base", Attributes = "href")] [TargetElement("base", Attributes = "href", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("blockquote", Attributes = "cite")] [TargetElement("blockquote", Attributes = "cite")]
[TargetElement("button", Attributes = "formaction")] [TargetElement("button", Attributes = "formaction")]
[TargetElement("del", Attributes = "cite")] [TargetElement("del", Attributes = "cite")]
[TargetElement("embed", Attributes = "src")] [TargetElement("embed", Attributes = "src", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("form", Attributes = "action")] [TargetElement("form", Attributes = "action")]
[TargetElement("html", Attributes = "manifest")] [TargetElement("html", Attributes = "manifest")]
[TargetElement("iframe", Attributes = "src")] [TargetElement("iframe", Attributes = "src")]
[TargetElement("img", Attributes = "src")] [TargetElement("img", Attributes = "src", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("input", Attributes = "src")] [TargetElement("input", Attributes = "src", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("input", Attributes = "formaction")] [TargetElement("input", Attributes = "formaction", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("ins", Attributes = "cite")] [TargetElement("ins", Attributes = "cite")]
[TargetElement("link", Attributes = "href")] [TargetElement("link", Attributes = "href", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("menuitem", Attributes = "icon")] [TargetElement("menuitem", Attributes = "icon")]
[TargetElement("object", Attributes = "archive")] [TargetElement("object", Attributes = "archive")]
[TargetElement("object", Attributes = "data")] [TargetElement("object", Attributes = "data")]
[TargetElement("q", Attributes = "cite")] [TargetElement("q", Attributes = "cite")]
[TargetElement("script", Attributes = "src")] [TargetElement("script", Attributes = "src")]
[TargetElement("source", Attributes = "src")] [TargetElement("source", Attributes = "src", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("track", Attributes = "src")] [TargetElement("track", Attributes = "src", TagStructure = TagStructure.WithoutEndTag)]
[TargetElement("video", Attributes = "src")] [TargetElement("video", Attributes = "src")]
[TargetElement("video", Attributes = "poster")] [TargetElement("video", Attributes = "poster")]
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]

5
src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs
View File

@ -16,7 +16,10 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
/// <remarks> /// <remarks>
/// The tag helper won't process for cases with just the 'src' attribute. /// The tag helper won't process for cases with just the 'src' attribute.
/// </remarks> /// </remarks>
[TargetElement("img", Attributes = AppendVersionAttributeName + "," + SrcAttributeName)] [TargetElement(
"img",
Attributes = AppendVersionAttributeName + "," + SrcAttributeName,
TagStructure = TagStructure.WithoutEndTag)]
public class ImageTagHelper : UrlResolutionTagHelper public class ImageTagHelper : UrlResolutionTagHelper
{ {
private static readonly string Namespace = typeof(ImageTagHelper).Namespace; private static readonly string Namespace = typeof(ImageTagHelper).Namespace;

2
src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
/// <summary> /// <summary>
/// <see cref="ITagHelper"/> implementation targeting &lt;input&gt; elements with an <c>asp-for</c> attribute. /// <see cref="ITagHelper"/> implementation targeting &lt;input&gt; elements with an <c>asp-for</c> attribute.
/// </summary> /// </summary>
[TargetElement("input", Attributes = ForAttributeName)] [TargetElement("input", Attributes = ForAttributeName, TagStructure = TagStructure.WithoutEndTag)]
public class InputTagHelper : TagHelper public class InputTagHelper : TagHelper
{ {
private const string ForAttributeName = "asp-for"; private const string ForAttributeName = "asp-for";

10
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
View File

@ -9,27 +9,27 @@
<h2>Image Tag Helper Test</h2> <h2>Image Tag Helper Test</h2>
<!-- Plain image tag --> <!-- Plain image tag -->
<img src="/images/red.png" alt="Red block" title="&lt;the title>" /> <img src="/images/red.png" alt="Red block" title="&lt;the title>">
<!-- Plain image tag with file version --> <!-- Plain image tag with file version -->
<img alt="Red versioned" title="Red versioned" src="/images/red.png?v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk" /> <img alt="Red versioned" title="Red versioned" src="/images/red.png?v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk" />
<!-- Plain image tag with file version set to false --> <!-- Plain image tag with file version set to false -->
<img alt="Red explicitly not versioned" title="Red versioned" src="/images/red.png" /> <img alt="Red explicitly not versioned" title="Red versioned" src="/images/red.png">
<!-- Plain image tag with absolute path and file version --> <!-- Plain image tag with absolute path and file version -->
<img alt="Absolute path versioned" src="http://contoso.com/hello/world" /> <img alt="Absolute path versioned" src="http://contoso.com/hello/world">
<!-- Plain image tag with file version and path to file that does not exist --> <!-- Plain image tag with file version and path to file that does not exist -->
<img alt="Path to non existing file" src="/images/fake.png" /> <img alt="Path to non existing file" src="/images/fake.png" />
<!-- Plain image tag with file version and path containing query string --> <!-- Plain image tag with file version and path containing query string -->
<img alt="Path with query string" src="/images/red.png?abc=def&amp;v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk" /> <img alt="Path with query string" src="/images/red.png?abc=def&amp;v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk">
<!-- Plain image tag with file version and path containing fragment --> <!-- Plain image tag with file version and path containing fragment -->
<img alt="Path with query string" src="/images/red.png?v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk#abc" /> <img alt="Path with query string" src="/images/red.png?v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk#abc" />
<!-- Plain image tag with file version and path linking to some action --> <!-- Plain image tag with file version and path linking to some action -->
<img alt="Path linking to some action" src="/controller/action" /> <img alt="Path linking to some action" src="/controller/action">
</body> </body>
</html> </html>

16
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
View File

@ -1,22 +1,22 @@
<html manifest="HtmlEncode[[/]]Person"> <html manifest="HtmlEncode[[/]]Person">
<head> <head>
<base href="HtmlEncode[[/]]A+Really(Crazy),Url.Is:This/HtmlEncode[[John Doe]]/Detail" target="_blank" /> <base href="HtmlEncode[[/]]A+Really(Crazy),Url.Is:This/HtmlEncode[[John Doe]]/Detail" target="_blank">
</head> </head>
<body> <body>
<dl itemscope itemid="HtmlEncode[[/]]Url"></dl> <dl itemscope itemid="HtmlEncode[[/]]Url"></dl>
<a href="HtmlEncode[[/]]Person">Person</a> <a href="HtmlEncode[[/]]Person">Person</a>
<area href="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" alt="Url stuff" /> <area href="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" alt="Url stuff">
<link href="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]/CSS" rel="stylesheet" /> <link href="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]/CSS" rel="stylesheet">
<video poster="HtmlEncode[[~/SomeUrl]]" src="HtmlEncode[[~/SomeUrl]]/HtmlEncode[[video]]" /> <video poster="HtmlEncode[[~/SomeUrl]]" src="HtmlEncode[[~/SomeUrl]]/HtmlEncode[[video]]" />
<audio src="HtmlEncode[[~/SomeUrl]]"> <audio src="HtmlEncode[[~/SomeUrl]]">
<source src="HtmlEncode[[/]]Person" /> <source src="HtmlEncode[[/]]Person">
<track src="HtmlEncode[[/]]emailHtmlEncode[[~/SomeUrl]]" /> <track src="HtmlEncode[[/]]emailHtmlEncode[[~/SomeUrl]]">
</audio> </audio>
<embed src="HtmlEncode[[/]]email@dyanmicUrl" /> <embed src="HtmlEncode[[/]]email@dyanmicUrl">
<iframe src="HtmlEncode[[~/SomeUrl]]" /> <iframe src="HtmlEncode[[~/SomeUrl]]" />
<img src="HtmlEncode[[/]]HtmlEncode[[~/SomeUrl]]" /> <img src="HtmlEncode[[/]]HtmlEncode[[~/SomeUrl]]">
<script src="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]/JS"></script> <script src="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]/JS"></script>
<input src="HtmlEncode[[/]]/Person" itemscope itemid="HtmlEncode[[/]]Person" formaction="HtmlEncode[[~/SomeUrl]]" /> <input src="HtmlEncode[[/]]/Person" itemscope itemid="HtmlEncode[[/]]Person" formaction="HtmlEncode[[~/SomeUrl]]">
<button formaction="HtmlEncode[[/]]\Person" /> <button formaction="HtmlEncode[[/]]\Person" />
<form action="HtmlEncode[[/]]~Person" /> <form action="HtmlEncode[[/]]~Person" />
<blockquote cite="HtmlEncode[[/]]Person" /> <blockquote cite="HtmlEncode[[/]]Person" />

16
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
View File

@ -1,22 +1,22 @@
<html manifest="/Person"> <html manifest="/Person">
<head> <head>
<base href="/A+Really(Crazy),Url.Is:This/John Doe/Detail" target="_blank" /> <base href="/A+Really(Crazy),Url.Is:This/John Doe/Detail" target="_blank">
</head> </head>
<body> <body>
<dl itemscope itemid="/Url"></dl> <dl itemscope itemid="/Url"></dl>
<a href="/Person">Person</a> <a href="/Person">Person</a>
<area href="/Person/John Doe" alt="Url stuff" /> <area href="/Person/John Doe" alt="Url stuff">
<link href="/Person/John Doe/CSS" rel="stylesheet" /> <link href="/Person/John Doe/CSS" rel="stylesheet">
<video poster="/SomeUrl" src="/SomeUrl/video" /> <video poster="/SomeUrl" src="/SomeUrl/video" />
<audio src="/SomeUrl"> <audio src="/SomeUrl">
<source src="/Person" /> <source src="/Person">
<track src="/email~/SomeUrl" /> <track src="/email~/SomeUrl">
</audio> </audio>
<embed src="/email@dyanmicUrl" /> <embed src="/email@dyanmicUrl">
<iframe src="/SomeUrl" /> <iframe src="/SomeUrl" />
<img src="/~/SomeUrl" /> <img src="/~/SomeUrl">
<script src="/Person/John Doe/JS"></script> <script src="/Person/John Doe/JS"></script>
<input src="//Person" itemscope itemid="/Person" formaction="/SomeUrl" /> <input src="//Person" itemscope itemid="/Person" formaction="/SomeUrl">
<button formaction="/\Person" /> <button formaction="/\Person" />
<form action="/~Person" /> <form action="/~Person" />
<blockquote cite="/Person" /> <blockquote cite="/Person" />

4
test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
View File

@ -48,7 +48,7 @@ namespace Asp
BeginContext(117, 1, true); BeginContext(117, 1, true);
WriteLiteral("\n"); WriteLiteral("\n");
EndContext(); EndContext();
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", true, "test", async() => { __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", TagMode.SelfClosing, "test", async() => {
} }
, StartTagHelperWritingScope, EndTagHelperWritingScope); , StartTagHelperWritingScope, EndTagHelperWritingScope);
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>(); __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
@ -67,7 +67,7 @@ __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__mo
BeginContext(142, 1, true); BeginContext(142, 1, true);
WriteLiteral("\n"); WriteLiteral("\n");
EndContext(); EndContext();
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", true, "test", async() => { __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", TagMode.SelfClosing, "test", async() => {
} }
, StartTagHelperWritingScope, EndTagHelperWritingScope); , StartTagHelperWritingScope, EndTagHelperWritingScope);
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>(); __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();

230
test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs
View File

@ -833,7 +833,7 @@ namespace Microsoft.AspNet.Mvc.Razor
page.HtmlEncoder = new CommonTestEncoder(); page.HtmlEncoder = new CommonTestEncoder();
var executionContext = new TagHelperExecutionContext( var executionContext = new TagHelperExecutionContext(
"p", "p",
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
items: null, items: null,
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: () => Task.FromResult(result: true), executeChildContentAsync: () => Task.FromResult(result: true),
@ -868,7 +868,7 @@ namespace Microsoft.AspNet.Mvc.Razor
page.HtmlEncoder = new CommonTestEncoder(); page.HtmlEncoder = new CommonTestEncoder();
var executionContext = new TagHelperExecutionContext( var executionContext = new TagHelperExecutionContext(
"p", "p",
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
items: null, items: null,
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: () => Task.FromResult(result: true), executeChildContentAsync: () => Task.FromResult(result: true),
@ -900,7 +900,7 @@ namespace Microsoft.AspNet.Mvc.Razor
page.HtmlEncoder = new CommonTestEncoder(); page.HtmlEncoder = new CommonTestEncoder();
var executionContext = new TagHelperExecutionContext( var executionContext = new TagHelperExecutionContext(
"p", "p",
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
items: null, items: null,
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: () => Task.FromResult(result: true), executeChildContentAsync: () => Task.FromResult(result: true),
@ -1053,7 +1053,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "div", tagName: "div",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1065,7 +1065,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1077,7 +1077,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: " ", tagName: " ",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1089,7 +1089,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList() { { "test", "testVal" } }, attributes: new TagHelperAttributeList() { { "test", "testVal" } },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1101,7 +1101,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList() { { "test", "testVal" }, { "something", " spaced " } }, attributes: new TagHelperAttributeList() { { "test", "testVal" }, { "something", " spaced " } },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1120,7 +1120,7 @@ namespace Microsoft.AspNet.Mvc.Razor
Minimized = true Minimized = true
}, },
}, },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1144,7 +1144,7 @@ namespace Microsoft.AspNet.Mvc.Razor
Minimized = true Minimized = true
}, },
}, },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1164,7 +1164,7 @@ namespace Microsoft.AspNet.Mvc.Razor
Minimized = true Minimized = true
}, },
}, },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1184,7 +1184,7 @@ namespace Microsoft.AspNet.Mvc.Razor
}, },
["last"] = "unminimized", ["last"] = "unminimized",
}, },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1196,7 +1196,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList() { { "test", "testVal" } }, attributes: new TagHelperAttributeList() { { "test", "testVal" } },
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1208,7 +1208,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList() { { "test", "testVal" }, { "something", " spaced " } }, attributes: new TagHelperAttributeList() { { "test", "testVal" }, { "something", " spaced " } },
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1216,11 +1216,35 @@ namespace Microsoft.AspNet.Mvc.Razor
postElement: null), postElement: null),
"<p test=\"HtmlEncode[[testVal]]\" something=\"HtmlEncode[[ spaced ]]\" />" "<p test=\"HtmlEncode[[testVal]]\" something=\"HtmlEncode[[ spaced ]]\" />"
}, },
{
GetTagHelperOutput(
tagName: "p",
attributes: new TagHelperAttributeList() { { "test", "testVal" } },
tagMode: TagMode.StartTagOnly,
preElement: null,
preContent: null,
content: "Hello World!",
postContent: null,
postElement: null),
"<p test=\"HtmlEncode[[testVal]]\">"
},
{
GetTagHelperOutput(
tagName: "p",
attributes: new TagHelperAttributeList() { { "test", "testVal" }, { "something", " spaced " } },
tagMode: TagMode.StartTagOnly,
preElement: null,
preContent: null,
content: "Hello World!",
postContent: null,
postElement: null),
"<p test=\"HtmlEncode[[testVal]]\" something=\"HtmlEncode[[ spaced ]]\">"
},
{ {
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: "Hello World!", preContent: "Hello World!",
content: null, content: null,
@ -1232,7 +1256,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: "Hello World!", content: "Hello World!",
@ -1244,7 +1268,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: null, content: null,
@ -1256,7 +1280,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1268,7 +1292,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "p", tagName: "p",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: null, preElement: null,
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1276,11 +1300,23 @@ namespace Microsoft.AspNet.Mvc.Razor
postElement: null), postElement: null),
"<p />" "<p />"
}, },
{
GetTagHelperOutput(
tagName: "p",
attributes: new TagHelperAttributeList(),
tagMode: TagMode.StartTagOnly,
preElement: null,
preContent: "Hello",
content: "Test",
postContent: "World!",
postElement: null),
"<p>"
},
{ {
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1292,7 +1328,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "random", tagName: "random",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: null, preElement: null,
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1300,11 +1336,23 @@ namespace Microsoft.AspNet.Mvc.Razor
postElement: null), postElement: null),
"<random />" "<random />"
}, },
{
GetTagHelperOutput(
tagName: "random",
attributes: new TagHelperAttributeList(),
tagMode: TagMode.StartTagOnly,
preElement: null,
preContent: "Hello",
content: "Test",
postContent: "World!",
postElement: null),
"<random>"
},
{ {
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: "Before", preElement: "Before",
preContent: null, preContent: null,
content: null, content: null,
@ -1316,7 +1364,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: "Before", preElement: "Before",
preContent: null, preContent: null,
content: null, content: null,
@ -1328,7 +1376,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList { { "test", "testVal" } }, attributes: new TagHelperAttributeList { { "test", "testVal" } },
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: "Before", preElement: "Before",
preContent: null, preContent: null,
content: null, content: null,
@ -1340,7 +1388,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList { { "test", "testVal" } }, attributes: new TagHelperAttributeList { { "test", "testVal" } },
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: "Before", preElement: "Before",
preContent: null, preContent: null,
content: null, content: null,
@ -1352,7 +1400,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: "Before", preElement: "Before",
preContent: null, preContent: null,
content: null, content: null,
@ -1360,11 +1408,47 @@ namespace Microsoft.AspNet.Mvc.Razor
postElement: null), postElement: null),
"Before<custom />" "Before<custom />"
}, },
{
GetTagHelperOutput(
tagName: null,
attributes: new TagHelperAttributeList { { "test", "testVal" } },
tagMode: TagMode.StartTagOnly,
preElement: "Before",
preContent: null,
content: null,
postContent: null,
postElement: null),
"Before"
},
{
GetTagHelperOutput(
tagName: "custom",
attributes: new TagHelperAttributeList { { "test", "testVal" } },
tagMode: TagMode.StartTagOnly,
preElement: "Before",
preContent: null,
content: null,
postContent: null,
postElement: null),
"Before<custom test=\"HtmlEncode[[testVal]]\">"
},
{ {
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagOnly,
preElement: "Before",
preContent: null,
content: null,
postContent: null,
postElement: null),
"Before<custom>"
},
{
GetTagHelperOutput(
tagName: "custom",
attributes: new TagHelperAttributeList(),
tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: null, content: null,
@ -1376,7 +1460,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: null, content: null,
@ -1388,7 +1472,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList { { "test", "testVal" } }, attributes: new TagHelperAttributeList { { "test", "testVal" } },
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: null, content: null,
@ -1400,7 +1484,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList { { "test", "testVal" } }, attributes: new TagHelperAttributeList { { "test", "testVal" } },
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: null, content: null,
@ -1412,7 +1496,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: null, preElement: null,
preContent: null, preContent: null,
content: null, content: null,
@ -1420,11 +1504,47 @@ namespace Microsoft.AspNet.Mvc.Razor
postElement: "After"), postElement: "After"),
"<custom />After" "<custom />After"
}, },
{
GetTagHelperOutput(
tagName: null,
attributes: new TagHelperAttributeList { { "test", "testVal" } },
tagMode: TagMode.StartTagOnly,
preElement: null,
preContent: null,
content: null,
postContent: null,
postElement: "After"),
"After"
},
{
GetTagHelperOutput(
tagName: "custom",
attributes: new TagHelperAttributeList { { "test", "testVal" } },
tagMode: TagMode.StartTagOnly,
preElement: null,
preContent: null,
content: null,
postContent: null,
postElement: "After"),
"<custom test=\"HtmlEncode[[testVal]]\">After"
},
{ {
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagOnly,
preElement: null,
preContent: null,
content: null,
postContent: null,
postElement: "After"),
"<custom>After"
},
{
GetTagHelperOutput(
tagName: "custom",
attributes: new TagHelperAttributeList(),
tagMode: TagMode.StartTagAndEndTag,
preElement: "Before", preElement: "Before",
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1436,7 +1556,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList { { "test", "testVal" } }, attributes: new TagHelperAttributeList { { "test", "testVal" } },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: "Before", preElement: "Before",
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1448,7 +1568,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: "custom", tagName: "custom",
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: "Before", preElement: "Before",
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1460,7 +1580,31 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: true, tagMode: TagMode.SelfClosing,
preElement: "Before",
preContent: "Hello",
content: "Test",
postContent: "World!",
postElement: "After"),
"BeforeHelloTestWorld!After"
},
{
GetTagHelperOutput(
tagName: "custom",
attributes: new TagHelperAttributeList(),
tagMode: TagMode.StartTagOnly,
preElement: "Before",
preContent: "Hello",
content: "Test",
postContent: "World!",
postElement: "After"),
"Before<custom>After"
},
{
GetTagHelperOutput(
tagName: null,
attributes: new TagHelperAttributeList(),
tagMode: TagMode.StartTagOnly,
preElement: "Before", preElement: "Before",
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1472,7 +1616,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList(), attributes: new TagHelperAttributeList(),
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: "Before", preElement: "Before",
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1484,7 +1628,7 @@ namespace Microsoft.AspNet.Mvc.Razor
GetTagHelperOutput( GetTagHelperOutput(
tagName: null, tagName: null,
attributes: new TagHelperAttributeList { { "test", "testVal" } }, attributes: new TagHelperAttributeList { { "test", "testVal" } },
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
preElement: "Before", preElement: "Before",
preContent: "Hello", preContent: "Hello",
content: "Test", content: "Test",
@ -1505,7 +1649,7 @@ namespace Microsoft.AspNet.Mvc.Razor
var context = CreateViewContext(writer); var context = CreateViewContext(writer);
var tagHelperExecutionContext = new TagHelperExecutionContext( var tagHelperExecutionContext = new TagHelperExecutionContext(
tagName: output.TagName, tagName: output.TagName,
selfClosing: output.SelfClosing, tagMode: output.TagMode,
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: () => Task.FromResult(result: true), executeChildContentAsync: () => Task.FromResult(result: true),
@ -1539,7 +1683,7 @@ namespace Microsoft.AspNet.Mvc.Razor
var context = CreateViewContext(writer); var context = CreateViewContext(writer);
var tagHelperExecutionContext = new TagHelperExecutionContext( var tagHelperExecutionContext = new TagHelperExecutionContext(
tagName: "p", tagName: "p",
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: () => executeChildContentAsync: () =>
@ -1575,7 +1719,7 @@ namespace Microsoft.AspNet.Mvc.Razor
var context = CreateViewContext(new StringWriter()); var context = CreateViewContext(new StringWriter());
var tagHelperExecutionContext = new TagHelperExecutionContext( var tagHelperExecutionContext = new TagHelperExecutionContext(
tagName: "p", tagName: "p",
selfClosing: false, tagMode: TagMode.StartTagAndEndTag,
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: () => { return Task.FromResult(result: true); }, executeChildContentAsync: () => { return Task.FromResult(result: true); },
@ -1604,7 +1748,7 @@ namespace Microsoft.AspNet.Mvc.Razor
var context = CreateViewContext(new StringWriter()); var context = CreateViewContext(new StringWriter());
var tagHelperExecutionContext = new TagHelperExecutionContext( var tagHelperExecutionContext = new TagHelperExecutionContext(
tagName: output.TagName, tagName: output.TagName,
selfClosing: output.SelfClosing, tagMode: output.TagMode,
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: () => Task.FromResult(result: true), executeChildContentAsync: () => Task.FromResult(result: true),
@ -1627,7 +1771,7 @@ namespace Microsoft.AspNet.Mvc.Razor
private static TagHelperOutput GetTagHelperOutput( private static TagHelperOutput GetTagHelperOutput(
string tagName, string tagName,
TagHelperAttributeList attributes, TagHelperAttributeList attributes,
bool selfClosing, TagMode tagMode,
string preElement, string preElement,
string preContent, string preContent,
string content, string content,
@ -1636,7 +1780,7 @@ namespace Microsoft.AspNet.Mvc.Razor
{ {
var output = new TagHelperOutput(tagName, attributes) var output = new TagHelperOutput(tagName, attributes)
{ {
SelfClosing = selfClosing TagMode = tagMode
}; };
output.PreElement.SetContent(preElement); output.PreElement.SetContent(preElement);

11
test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs
View File

@ -11,7 +11,6 @@ using Microsoft.AspNet.Mvc.ModelBinding;
using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Rendering;
using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers;
using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing;
using Microsoft.Framework.WebEncoders.Testing;
using Moq; using Moq;
using Xunit; using Xunit;
@ -137,7 +136,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
Assert.Equal("form", output.TagName); Assert.Equal("form", output.TagName);
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.IsEmpty);
@ -207,7 +206,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
await formTagHelper.ProcessAsync(context, output); await formTagHelper.ProcessAsync(context, output);
Assert.Equal("form", output.TagName); Assert.Equal("form", output.TagName);
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagAndEndTag ,output.TagMode);
var attribute = Assert.Single(output.Attributes); var attribute = Assert.Single(output.Attributes);
Assert.Equal(expectedAttribute, attribute); Assert.Equal(expectedAttribute, attribute);
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
@ -259,7 +258,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
generator.Verify(); generator.Verify();
Assert.Equal("form", output.TagName); Assert.Equal("form", output.TagName);
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.Empty(output.PreElement.GetContent()); Assert.Empty(output.PreElement.GetContent());
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
@ -312,7 +311,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
generator.Verify(); generator.Verify();
Assert.Equal("form", output.TagName); Assert.Equal("form", output.TagName);
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.Empty(output.PreElement.GetContent()); Assert.Empty(output.PreElement.GetContent());
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
@ -364,7 +363,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
Assert.Equal("form", output.TagName); Assert.Equal("form", output.TagName);
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
var attribute = Assert.Single(output.Attributes); var attribute = Assert.Single(output.Attributes);
Assert.Equal(new TagHelperAttribute("aCTiON", "my-action"), attribute); Assert.Equal(new TagHelperAttribute("aCTiON", "my-action"), attribute);
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());

39
test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs
View File

@ -4,17 +4,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Html.Abstractions;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding;
using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Rendering;
using Microsoft.AspNet.Mvc.Rendering.Internal; using Microsoft.AspNet.Mvc.Rendering.Internal;
using Microsoft.AspNet.Mvc.TestCommon; using Microsoft.AspNet.Mvc.TestCommon;
using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers;
using Microsoft.Framework.WebEncoders.Testing;
using Moq; using Moq;
using Xunit; using Xunit;
@ -96,7 +93,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
getChildContentAsync: useCachedResult => Task.FromResult<TagHelperContent>(result: null)); getChildContentAsync: useCachedResult => Task.FromResult<TagHelperContent>(result: null));
var output = new TagHelperOutput(originalTagName, outputAttributes) var output = new TagHelperOutput(originalTagName, outputAttributes)
{ {
SelfClosing = true, TagMode = TagMode.SelfClosing,
}; };
output.Content.SetContent(originalContent); output.Content.SetContent(originalContent);
var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider()); var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider());
@ -108,7 +105,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
Assert.Empty(output.Attributes); // Moved to Content and cleared Assert.Empty(output.Attributes); // Moved to Content and cleared
Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content)); Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content));
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Null(output.TagName); // Cleared Assert.Null(output.TagName); // Cleared
} }
@ -209,7 +206,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}; };
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagOnly,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -240,7 +237,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());
Assert.Equal(expectedPostContent, output.PostContent.GetContent()); Assert.Equal(expectedPostContent, output.PostContent.GetContent());
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagOnly, output.TagMode);
Assert.Equal(expectedTagName, output.TagName); Assert.Equal(expectedTagName, output.TagName);
} }
@ -271,7 +268,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}; };
var output = new TagHelperOutput(originalTagName, originalAttributes) var output = new TagHelperOutput(originalTagName, originalAttributes)
{ {
SelfClosing = true, TagMode = TagMode.SelfClosing,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(originalContent); output.Content.SetContent(originalContent);
@ -313,7 +310,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content)); Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content));
Assert.Equal(expectedPostContent, output.PostContent.GetContent()); Assert.Equal(expectedPostContent, output.PostContent.GetContent());
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Null(output.TagName); // Cleared Assert.Null(output.TagName); // Cleared
} }
@ -367,7 +364,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}; };
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagOnly,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -408,7 +405,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
htmlGenerator.Verify(); htmlGenerator.Verify();
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagOnly, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());
@ -466,7 +463,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}; };
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagOnly,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -506,7 +503,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
htmlGenerator.Verify(); htmlGenerator.Verify();
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagOnly, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());
@ -562,7 +559,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}; };
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagOnly,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -597,7 +594,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
htmlGenerator.Verify(); htmlGenerator.Verify();
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagOnly, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());
@ -669,7 +666,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}; };
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagOnly,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -710,7 +707,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
htmlGenerator.Verify(); htmlGenerator.Verify();
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagOnly, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());
@ -781,7 +778,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
var output = new TagHelperOutput(expectedTagName, attributes: new TagHelperAttributeList()) var output = new TagHelperOutput(expectedTagName, attributes: new TagHelperAttributeList())
{ {
SelfClosing = true, TagMode = TagMode.SelfClosing,
}; };
var metadataProvider = new TestModelMetadataProvider(); var metadataProvider = new TestModelMetadataProvider();
@ -821,7 +818,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
htmlGenerator.Verify(); htmlGenerator.Verify();
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
Assert.Equal(string.Empty, output.Content.GetContent()); Assert.Equal(string.Empty, output.Content.GetContent());
@ -862,7 +859,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
var output = new TagHelperOutput(expectedTagName, attributes: new TagHelperAttributeList()) var output = new TagHelperOutput(expectedTagName, attributes: new TagHelperAttributeList())
{ {
SelfClosing = true, TagMode = TagMode.SelfClosing,
}; };
var htmlAttributes = new Dictionary<string, object> var htmlAttributes = new Dictionary<string, object>
@ -896,7 +893,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// Assert // Assert
htmlGenerator.Verify(); htmlGenerator.Verify();
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
Assert.Equal(string.Empty, output.Content.GetContent()); Assert.Equal(string.Empty, output.Content.GetContent());

6
test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
View File

@ -207,13 +207,13 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.PostContent.SetContent(expectedPostContent); output.PostContent.SetContent(expectedPostContent);
// LabelTagHelper checks IsContentModified so we don't want to forcibly set it if // LabelTagHelper checks IsContentModified so we don't want to forcibly set it if
// tagHelperOutputContent.OriginalContent is going to be null or empty. // tagHelperOutputContent.OriginalContent is going to be null or empty.
if (!string.IsNullOrEmpty(tagHelperOutputContent.OriginalContent)) if (!string.IsNullOrEmpty(tagHelperOutputContent.OriginalContent))
{ {
output.Content.SetContent(tagHelperOutputContent.OriginalContent); output.Content.SetContent(tagHelperOutputContent.OriginalContent);
} }
var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider); var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
tagHelper.ViewContext = viewContext; tagHelper.ViewContext = viewContext;
@ -227,7 +227,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
tagHelperOutputContent.ExpectedContent, tagHelperOutputContent.ExpectedContent,
HtmlContentUtilities.HtmlContentToString(output.Content)); HtmlContentUtilities.HtmlContentToString(output.Content));
Assert.Equal(expectedPostContent, output.PostContent.GetContent()); Assert.Equal(expectedPostContent, output.PostContent.GetContent());
Assert.False(output.SelfClosing); Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
Assert.Equal(expectedTagName, output.TagName); Assert.Equal(expectedTagName, output.TagName);
} }

6
test/Microsoft.AspNet.Mvc.TagHelpers.Test/OptionTagHelperTest.cs
View File

@ -407,7 +407,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
var output = new TagHelperOutput(expectedTagHelperOutput.TagName, originalAttributes) var output = new TagHelperOutput(expectedTagHelperOutput.TagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagAndEndTag
}; };
output.Content.SetContent(originalContent); output.Content.SetContent(originalContent);
@ -475,7 +475,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}); });
var output = new TagHelperOutput(originalTagName, originalAttributes) var output = new TagHelperOutput(originalTagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagAndEndTag,
}; };
output.PreContent.SetContent(originalPreContent); output.PreContent.SetContent(originalPreContent);
output.Content.SetContent(originalContent); output.Content.SetContent(originalContent);
@ -537,7 +537,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
var output = new TagHelperOutput(originalTagName, originalAttributes) var output = new TagHelperOutput(originalTagName, originalAttributes)
{ {
SelfClosing = false, TagMode = TagMode.StartTagAndEndTag,
}; };
output.PreContent.SetContent(originalPreContent); output.PreContent.SetContent(originalPreContent);
output.Content.SetContent(originalContent); output.Content.SetContent(originalContent);

12
test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
View File

@ -211,7 +211,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}); });
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = true, TagMode = TagMode.SelfClosing,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -235,7 +235,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
await tagHelper.ProcessAsync(tagHelperContext, output); await tagHelper.ProcessAsync(tagHelperContext, output);
// Assert // Assert
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());
@ -298,7 +298,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}); });
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = true, TagMode = TagMode.SelfClosing,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -331,7 +331,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
await tagHelper.ProcessAsync(tagHelperContext, output); await tagHelper.ProcessAsync(tagHelperContext, output);
// Assert // Assert
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());
@ -400,7 +400,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}); });
var output = new TagHelperOutput(expectedTagName, originalAttributes) var output = new TagHelperOutput(expectedTagName, originalAttributes)
{ {
SelfClosing = true TagMode = TagMode.SelfClosing,
}; };
output.PreContent.SetContent(expectedPreContent); output.PreContent.SetContent(expectedPreContent);
output.Content.SetContent(expectedContent); output.Content.SetContent(expectedContent);
@ -434,7 +434,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
await tagHelper.ProcessAsync(tagHelperContext, output); await tagHelper.ProcessAsync(tagHelperContext, output);
// Assert // Assert
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedPreContent, output.PreContent.GetContent()); Assert.Equal(expectedPreContent, output.PreContent.GetContent());
Assert.Equal(expectedContent, output.Content.GetContent()); Assert.Equal(expectedContent, output.Content.GetContent());

4
test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
View File

@ -139,7 +139,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
}; };
var output = new TagHelperOutput(expectedTagName, htmlAttributes) var output = new TagHelperOutput(expectedTagName, htmlAttributes)
{ {
SelfClosing = true, TagMode = TagMode.SelfClosing,
}; };
output.Content.SetContent("original content"); output.Content.SetContent("original content");
@ -150,7 +150,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
await tagHelper.ProcessAsync(tagHelperContext, output); await tagHelper.ProcessAsync(tagHelperContext, output);
// Assert // Assert
Assert.True(output.SelfClosing); Assert.Equal(TagMode.SelfClosing, output.TagMode);
Assert.Equal(expectedAttributes, output.Attributes); Assert.Equal(expectedAttributes, output.Attributes);
Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content)); Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content));
Assert.Equal(expectedTagName, output.TagName); Assert.Equal(expectedTagName, output.TagName);

10
test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
View File

@ -11,27 +11,27 @@
<h2>Image Tag Helper Test</h2> <h2>Image Tag Helper Test</h2>
<!-- Plain image tag --> <!-- Plain image tag -->
<img src="~/images/red.png" alt="Red block" title="&lt;the title>" /> <img src="~/images/red.png" alt="Red block" title="&lt;the title>">
<!-- Plain image tag with file version --> <!-- Plain image tag with file version -->
<img src="~/images/red.png" alt="Red versioned" title="Red versioned" asp-append-version="true" /> <img src="~/images/red.png" alt="Red versioned" title="Red versioned" asp-append-version="true" />
<!-- Plain image tag with file version set to false --> <!-- Plain image tag with file version set to false -->
<img src="~/images/red.png" alt="Red explicitly not versioned" title="Red versioned" asp-append-version="false" /> <img src="~/images/red.png" alt="Red explicitly not versioned" title="Red versioned" asp-append-version="false">
<!-- Plain image tag with absolute path and file version --> <!-- Plain image tag with absolute path and file version -->
<img src="http://contoso.com/hello/world" alt="Absolute path versioned" asp-append-version="true" /> <img src="http://contoso.com/hello/world" alt="Absolute path versioned" asp-append-version="true">
<!-- Plain image tag with file version and path to file that does not exist --> <!-- Plain image tag with file version and path to file that does not exist -->
<img src="~/images/fake.png" alt="Path to non existing file" asp-append-version="true" /> <img src="~/images/fake.png" alt="Path to non existing file" asp-append-version="true" />
<!-- Plain image tag with file version and path containing query string --> <!-- Plain image tag with file version and path containing query string -->
<img src="~/images/red.png?abc=def" alt="Path with query string" asp-append-version="true" /> <img src="~/images/red.png?abc=def" alt="Path with query string" asp-append-version="true">
<!-- Plain image tag with file version and path containing fragment --> <!-- Plain image tag with file version and path containing fragment -->
<img src="~/images/red.png#abc" alt="Path with query string" asp-append-version="true" /> <img src="~/images/red.png#abc" alt="Path with query string" asp-append-version="true" />
<!-- Plain image tag with file version and path linking to some action --> <!-- Plain image tag with file version and path linking to some action -->
<img src="/controller/action" alt="Path linking to some action" asp-append-version="true" /> <img src="/controller/action" alt="Path linking to some action" asp-append-version="true">
</body> </body>
</html> </html>

16
test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
View File

@ -6,23 +6,23 @@
<html manifest="~/Person"> <html manifest="~/Person">
<head> <head>
<base href="~/A+Really(Crazy),Url.Is:This/@Model.Name/Detail" target="_blank"/> <base href="~/A+Really(Crazy),Url.Is:This/@Model.Name/Detail" target="_blank">
</head> </head>
<body> <body>
<dl itemscope itemid="~/Url"></dl> <dl itemscope itemid="~/Url"></dl>
<a href="~/Person">Person</a> <a href="~/Person">Person</a>
<area href="~/Person/@Model.Name" alt="Url stuff" /> <area href="~/Person/@Model.Name" alt="Url stuff" >
<link href="~/Person/@Model.Name/CSS" rel="stylesheet" /> <link href="~/Person/@Model.Name/CSS" rel="stylesheet">
<video poster=@dynamicUrl src='@dynamicUrl/@("video")' /> <video poster=@dynamicUrl src='@dynamicUrl/@("video")' />
<audio src="@(dynamicUrl)"> <audio src="@(dynamicUrl)">
<source src="~/Person" /> <source src="~/Person">
<track src="~/email@(dynamicUrl)" /> <track src="~/email@(dynamicUrl)">
</audio> </audio>
<embed src="~/email@dyanmicUrl" /> <embed src="~/email@dyanmicUrl">
<iframe src=@(dynamicUrl) /> <iframe src=@(dynamicUrl) />
<img src="~/@dynamicUrl" /> <img src="~/@dynamicUrl">
<script src="~/Person/@Model.Name/JS"></script> <script src="~/Person/@Model.Name/JS"></script>
<input src="~//Person" itemscope itemid="~/Person" formaction=@dynamicUrl /> <input src="~//Person" itemscope itemid="~/Person" formaction=@dynamicUrl>
<button formaction="~/\Person" /> <button formaction="~/\Person" />
<form action="~/~Person" /> <form action="~/~Person" />
<blockquote cite="~/Person" /> <blockquote cite="~/Person" />

2
test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
View File

@ -23,7 +23,7 @@ namespace TagHelpersWebSite.TagHelpers
Info.CopyrightYear.ToString(), Info.CopyrightYear.ToString(),
Info.Approved.ToString(), Info.Approved.ToString(),
Info.TagsToShow.ToString())); Info.TagsToShow.ToString()));
output.SelfClosing = false; output.TagMode = TagMode.StartTagAndEndTag;
} }
} }
} }