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

React to aspnet/Razor#621.

This commit is contained in:
N. Taylor Mullen 2016-03-31 16:31:30 -07:00
parent 7cb1dca467
commit ee80f5f84c
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs
View File

@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
var childContent = await output.GetChildContentAsync(); var childContent = await output.GetChildContentAsync();
if (childContent.IsWhiteSpace) if (childContent.IsEmptyOrWhiteSpace)
{ {
// Provide default label text since there was nothing useful in the Razor source. // Provide default label text since there was nothing useful in the Razor source.
output.Content.SetHtmlContent(tagBuilder.InnerHtml); output.Content.SetHtmlContent(tagBuilder.InnerHtml);

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs
View File

@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
var childContent = await output.GetChildContentAsync(); var childContent = await output.GetChildContentAsync();
if (childContent.IsWhiteSpace) if (childContent.IsEmptyOrWhiteSpace)
{ {
// Provide default label text since there was nothing useful in the Razor source. // Provide default label text since there was nothing useful in the Razor source.
output.Content.SetHtmlContent(tagBuilder.InnerHtml); output.Content.SetHtmlContent(tagBuilder.InnerHtml);

10
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
View File

@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
generator.Verify(); generator.Verify();
Assert.Equal("a", output.TagName); Assert.Equal("a", output.TagName);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
} }
[Fact] [Fact]
@ -184,7 +184,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
generator.Verify(); generator.Verify();
Assert.Equal("a", output.TagName); Assert.Equal("a", output.TagName);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
} }
[Fact] [Fact]
@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.Equal("a", output.TagName); Assert.Equal("a", output.TagName);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
} }
[Fact] [Fact]
@ -299,7 +299,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.Equal("a", output.TagName); Assert.Equal("a", output.TagName);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
} }
[Fact] [Fact]
@ -356,7 +356,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.Equal("a", output.TagName); Assert.Equal("a", output.TagName);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
} }
[Theory] [Theory]

2
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs
View File

@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Test
// Assert // Assert
Assert.Null(output.TagName); Assert.Null(output.TagName);
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Empty(output.PostContent.GetContent()); Assert.Empty(output.PostContent.GetContent());
Assert.True(output.IsContentModified); Assert.True(output.IsContentModified);
} }

18
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
View File

@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action")); attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action"));
Assert.Equal("home/index", attribute.Value); Assert.Equal("home/index", attribute.Value);
Assert.Empty(output.PreContent.GetContent()); Assert.Empty(output.PreContent.GetContent());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Equal(expectedPostContent, output.PostContent.GetContent()); Assert.Equal(expectedPostContent, output.PostContent.GetContent());
Assert.Equal(expectedTagName, output.TagName); Assert.Equal(expectedTagName, output.TagName);
} }
@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Equal(expectedPostContent, output.PostContent.GetContent()); Assert.Equal(expectedPostContent, output.PostContent.GetContent());
} }
@ -227,7 +227,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Empty(output.PostContent.GetContent()); Assert.Empty(output.PostContent.GetContent());
generator.Verify(); generator.Verify();
} }
@ -279,7 +279,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Empty(output.PostContent.GetContent()); Assert.Empty(output.PostContent.GetContent());
} }
@ -335,7 +335,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Empty(output.PostContent.GetContent()); Assert.Empty(output.PostContent.GetContent());
} }
@ -391,7 +391,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Empty(output.PostContent.GetContent()); Assert.Empty(output.PostContent.GetContent());
} }
@ -448,7 +448,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Empty(output.PostContent.GetContent()); Assert.Empty(output.PostContent.GetContent());
} }
@ -501,7 +501,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Empty(output.PostContent.GetContent()); Assert.Empty(output.PostContent.GetContent());
Assert.Empty(output.PostElement.GetContent()); Assert.Empty(output.PostElement.GetContent());
} }
@ -554,7 +554,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
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());
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Equal(expectedPostContent, output.PostContent.GetContent()); Assert.Equal(expectedPostContent, output.PostContent.GetContent());
} }

6
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
View File

@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
helper.Process(context, output); helper.Process(context, output);
// Assert // Assert
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Equal("img", output.TagName); Assert.Equal("img", output.TagName);
Assert.Equal(2, output.Attributes.Count); Assert.Equal(2, output.Attributes.Count);
var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src")); var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));
@ -216,7 +216,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
helper.Process(context, output); helper.Process(context, output);
// Assert // Assert
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Equal("img", output.TagName); Assert.Equal("img", output.TagName);
Assert.Equal(2, output.Attributes.Count); Assert.Equal(2, output.Attributes.Count);
var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src")); var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));
@ -251,7 +251,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Act // Act
helper.Process(context, output); helper.Process(context, output);
// Assert // Assert
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.Equal("img", output.TagName); Assert.Equal("img", output.TagName);
Assert.Equal(2, output.Attributes.Count); Assert.Equal(2, output.Attributes.Count);
var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src")); var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));

6
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
View File

@ -402,7 +402,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Assert // Assert
Assert.Null(output.TagName); Assert.Null(output.TagName);
Assert.True(output.IsContentModified); Assert.True(output.IsContentModified);
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.True(output.PostElement.IsModified); Assert.True(output.PostElement.IsModified);
} }
@ -559,7 +559,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.NotNull(output.TagName); Assert.NotNull(output.TagName);
Assert.False(output.IsContentModified); Assert.False(output.IsContentModified);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.PostElement.IsEmpty); Assert.True(output.PostElement.GetContent().Length == 0);
} }
[Fact] [Fact]
@ -588,7 +588,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.NotNull(output.TagName); Assert.NotNull(output.TagName);
Assert.False(output.IsContentModified); Assert.False(output.IsContentModified);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.PostElement.IsEmpty); Assert.True(output.PostElement.GetContent().Length == 0);
} }
[Fact] [Fact]

6
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
View File

@ -395,7 +395,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Assert // Assert
Assert.Null(output.TagName); Assert.Null(output.TagName);
Assert.True(output.IsContentModified); Assert.True(output.IsContentModified);
Assert.True(output.Content.IsEmpty); Assert.True(output.Content.GetContent().Length == 0);
Assert.True(output.PostElement.IsModified); Assert.True(output.PostElement.IsModified);
} }
@ -494,7 +494,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.NotNull(output.TagName); Assert.NotNull(output.TagName);
Assert.False(output.IsContentModified); Assert.False(output.IsContentModified);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.PostElement.IsEmpty); Assert.True(output.PostElement.GetContent().Length == 0);
} }
[Fact] [Fact]
@ -522,7 +522,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.Equal("script", output.TagName); Assert.Equal("script", output.TagName);
Assert.False(output.IsContentModified); Assert.False(output.IsContentModified);
Assert.Empty(output.Attributes); Assert.Empty(output.Attributes);
Assert.True(output.PostElement.IsEmpty); Assert.True(output.PostElement.GetContent().Length == 0);
} }
[Fact] [Fact]