From ee80f5f84c9ee6b3d4f900e14e574f5b88ecec28 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Thu, 31 Mar 2016 16:31:30 -0700 Subject: [PATCH] React to aspnet/Razor#621. --- .../LabelTagHelper.cs | 2 +- .../ValidationMessageTagHelper.cs | 2 +- .../AnchorTagHelperTest.cs | 10 +++++----- .../EnvironmentTagHelperTest.cs | 2 +- .../FormTagHelperTest.cs | 18 +++++++++--------- .../ImageTagHelperTest.cs | 6 +++--- .../LinkTagHelperTest.cs | 6 +++--- .../ScriptTagHelperTest.cs | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs index 998abb0a2c..a1127e9e5e 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs @@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers { var childContent = await output.GetChildContentAsync(); - if (childContent.IsWhiteSpace) + if (childContent.IsEmptyOrWhiteSpace) { // Provide default label text since there was nothing useful in the Razor source. output.Content.SetHtmlContent(tagBuilder.InnerHtml); diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs index e58f05757a..fd4f02fcad 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs @@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers { var childContent = await output.GetChildContentAsync(); - if (childContent.IsWhiteSpace) + if (childContent.IsEmptyOrWhiteSpace) { // Provide default label text since there was nothing useful in the Razor source. output.Content.SetHtmlContent(tagBuilder.InnerHtml); diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs index bd4596b6e4..b7ef094013 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs @@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers generator.Verify(); Assert.Equal("a", output.TagName); Assert.Empty(output.Attributes); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); } [Fact] @@ -184,7 +184,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers generator.Verify(); Assert.Equal("a", output.TagName); Assert.Empty(output.Attributes); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); } [Fact] @@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Equal("a", output.TagName); Assert.Empty(output.Attributes); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); } [Fact] @@ -299,7 +299,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Equal("a", output.TagName); Assert.Empty(output.Attributes); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); } [Fact] @@ -356,7 +356,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Equal("a", output.TagName); Assert.Empty(output.Attributes); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); } [Theory] diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs index 884b053b50..5e43ace049 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Test // Assert Assert.Null(output.TagName); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Empty(output.PostContent.GetContent()); Assert.True(output.IsContentModified); } diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs index 9a23f3aa7e..1668c5ef6b 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs @@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action")); Assert.Equal("home/index", attribute.Value); 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(expectedTagName, output.TagName); } @@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers var attribute = Assert.Single(output.Attributes); Assert.Equal(expectedAttribute, attribute); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Equal(expectedPostContent, output.PostContent.GetContent()); } @@ -227,7 +227,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers var attribute = Assert.Single(output.Attributes); Assert.Equal(expectedAttribute, attribute); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Empty(output.PostContent.GetContent()); generator.Verify(); } @@ -279,7 +279,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Empty(output.Attributes); Assert.Empty(output.PreElement.GetContent()); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Empty(output.PostContent.GetContent()); } @@ -335,7 +335,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Empty(output.Attributes); Assert.Empty(output.PreElement.GetContent()); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Empty(output.PostContent.GetContent()); } @@ -391,7 +391,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Empty(output.Attributes); Assert.Empty(output.PreElement.GetContent()); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Empty(output.PostContent.GetContent()); } @@ -448,7 +448,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Empty(output.Attributes); Assert.Empty(output.PreElement.GetContent()); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Empty(output.PostContent.GetContent()); } @@ -501,7 +501,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Empty(output.Attributes); Assert.Empty(output.PreElement.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.PostElement.GetContent()); } @@ -554,7 +554,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers var attribute = Assert.Single(output.Attributes); Assert.Equal(new TagHelperAttribute("aCTiON", "my-action"), attribute); Assert.Empty(output.PreContent.GetContent()); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Equal(expectedPostContent, output.PostContent.GetContent()); } diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs index f4c098bafd..c089703a76 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs @@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers helper.Process(context, output); // Assert - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Equal("img", output.TagName); Assert.Equal(2, output.Attributes.Count); var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src")); @@ -216,7 +216,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers helper.Process(context, output); // Assert - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Equal("img", output.TagName); Assert.Equal(2, output.Attributes.Count); var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src")); @@ -251,7 +251,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers // Act helper.Process(context, output); // Assert - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.Equal("img", output.TagName); Assert.Equal(2, output.Attributes.Count); var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src")); diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs index 3b3f3616bf..64348c3064 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs @@ -402,7 +402,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers // Assert Assert.Null(output.TagName); Assert.True(output.IsContentModified); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.True(output.PostElement.IsModified); } @@ -559,7 +559,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.NotNull(output.TagName); Assert.False(output.IsContentModified); Assert.Empty(output.Attributes); - Assert.True(output.PostElement.IsEmpty); + Assert.True(output.PostElement.GetContent().Length == 0); } [Fact] @@ -588,7 +588,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.NotNull(output.TagName); Assert.False(output.IsContentModified); Assert.Empty(output.Attributes); - Assert.True(output.PostElement.IsEmpty); + Assert.True(output.PostElement.GetContent().Length == 0); } [Fact] diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs index 14c8e8b72e..a493dab2c4 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs @@ -395,7 +395,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers // Assert Assert.Null(output.TagName); Assert.True(output.IsContentModified); - Assert.True(output.Content.IsEmpty); + Assert.True(output.Content.GetContent().Length == 0); Assert.True(output.PostElement.IsModified); } @@ -494,7 +494,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.NotNull(output.TagName); Assert.False(output.IsContentModified); Assert.Empty(output.Attributes); - Assert.True(output.PostElement.IsEmpty); + Assert.True(output.PostElement.GetContent().Length == 0); } [Fact] @@ -522,7 +522,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers Assert.Equal("script", output.TagName); Assert.False(output.IsContentModified); Assert.Empty(output.Attributes); - Assert.True(output.PostElement.IsEmpty); + Assert.True(output.PostElement.GetContent().Length == 0); } [Fact]