From 99901ed4fea1f376bcc4745797119b4102f54a66 Mon Sep 17 00:00:00 2001 From: Chris R Date: Fri, 30 Oct 2015 10:49:35 -0700 Subject: [PATCH] React to HtmlEncoder type changes. --- .../TagHelpers/DefaultTagHelperContent.cs | 6 ++-- .../TagHelpers/TagHelperContent.cs | 10 +++--- .../GeneratedTagHelperContext.cs | 2 +- .../TagHelperExecutionContextTest.cs | 6 ++-- .../TagHelpers/DefaultTagHelperContentTest.cs | 36 +++++++++---------- .../TagHelpers/TagHelperOutputTest.cs | 31 ++++++++-------- .../project.json | 2 +- 7 files changed, 46 insertions(+), 47 deletions(-) diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs index 38a28193ae..9ecfb808df 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs @@ -5,10 +5,10 @@ using System; using System.Diagnostics; using System.IO; using System.Text; +using System.Text.Encodings.Web; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.Extensions.Internal; -using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Razor.TagHelpers { @@ -156,7 +156,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers } /// - public override string GetContent(IHtmlEncoder encoder) + public override string GetContent(HtmlEncoder encoder) { if (_buffer == null) { @@ -171,7 +171,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers } /// - public override void WriteTo(TextWriter writer, IHtmlEncoder encoder) + public override void WriteTo(TextWriter writer, HtmlEncoder encoder) { if (writer == null) { diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs index 8fe406274f..5cb0505978 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs @@ -3,8 +3,8 @@ using System; using System.IO; +using System.Text.Encodings.Web; using Microsoft.AspNet.Html.Abstractions; -using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Razor.TagHelpers { @@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers public abstract class TagHelperContent : IHtmlContentBuilder { /// - /// Gets a value indicating whether the content was modifed. + /// Gets a value indicating whether the content was modified. /// public abstract bool IsModified { get; } @@ -137,12 +137,12 @@ namespace Microsoft.AspNet.Razor.TagHelpers /// /// Gets the content. /// - /// The . + /// The . /// A containing the content. - public abstract string GetContent(IHtmlEncoder encoder); + public abstract string GetContent(HtmlEncoder encoder); /// - public abstract void WriteTo(TextWriter writer, IHtmlEncoder encoder); + public abstract void WriteTo(TextWriter writer, HtmlEncoder encoder); /// IHtmlContentBuilder IHtmlContentBuilder.Append(IHtmlContent content) diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs index 50120c8012..70a9ddc9bd 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs @@ -197,7 +197,7 @@ namespace Microsoft.AspNet.Razor.CodeGenerators public string WriteTagHelperToAsyncMethodName { get; set; } /// - /// The name of the property containing the IHtmlEncoder. + /// The name of the property containing the HtmlEncoder. /// public string HtmlEncoderPropertyName { get; set; } diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs index 51a5cdf242..a719d07212 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs @@ -83,8 +83,8 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers var content2 = await executionContext.GetChildContentAsync(useCachedResult: true); // Assert - Assert.Equal(expectedContent, content1.GetContent(new CommonTestEncoder())); - Assert.Equal(expectedContent, content2.GetContent(new CommonTestEncoder())); + Assert.Equal(expectedContent, content1.GetContent(new HtmlTestEncoder())); + Assert.Equal(expectedContent, content2.GetContent(new HtmlTestEncoder())); } [Fact] @@ -140,7 +140,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers Assert.NotSame(content1, content2); var content3 = await executionContext.GetChildContentAsync(useCachedResult); - Assert.Empty(content3.GetContent(new CommonTestEncoder())); + Assert.Empty(content3.GetContent(new HtmlTestEncoder())); } [Fact] diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs index fc5fb2f7f3..8ec73d26e3 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.SetContent("Hello World!"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.SetContent("Hello World!"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.SetHtmlContent("Hi"); // Assert - Assert.Equal("Hi", tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal("Hi", tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -63,7 +63,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.SetHtmlContent("Hello World!"); // Assert - Assert.Equal("Hello World!", tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal("Hello World!", tagHelperContent.GetContent(new HtmlTestEncoder())); } [Theory] @@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers copiedTagHelperContent.SetContent(tagHelperContent); // Assert - Assert.Equal(expected, copiedTagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, copiedTagHelperContent.GetContent(new HtmlTestEncoder())); } // GetContent - this one relies on the default encoder. @@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.Append("Hello World!"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers // Assert Assert.Equal( "HtmlEncode[[First]] HtmlEncode[[Second]] HtmlEncode[[Third]] HtmlEncode[[Fourth]]!", - tagHelperContent.GetContent(new CommonTestEncoder())); + tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -147,7 +147,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers Assert.Equal( "Numbers in InvariantCulture - HtmlEncode[[1.10]] HtmlEncode[[2.98]] " + "HtmlEncode[[145.82]] HtmlEncode[[32.86]]!", - tagHelperContent.GetContent(new CommonTestEncoder())); + tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -163,7 +163,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.AppendFormat("Content was {0}", helloWorldContent); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -182,7 +182,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers copiedTagHelperContent.Append(tagHelperContent); // Assert - Assert.Equal(expected, copiedTagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, copiedTagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -403,7 +403,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.SetContent("Hello ").Append("World!"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -417,7 +417,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.SetContent("First ").AppendFormat("{0} Third", "Second"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -434,7 +434,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers .Append("Fourth"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -449,7 +449,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.Clear().SetContent("Hello World"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -464,7 +464,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.Clear().SetContent("Hello ").Append("World!"); // Assert - Assert.Equal(expected, tagHelperContent.GetContent(new CommonTestEncoder())); + Assert.Equal(expected, tagHelperContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -477,7 +477,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers tagHelperContent.Append("World"); // Act - tagHelperContent.WriteTo(writer, new CommonTestEncoder()); + tagHelperContent.WriteTo(writer, new HtmlTestEncoder()); // Assert Assert.Equal("HtmlEncode[[Hello ]]HtmlEncode[[World]]", writer.ToString()); @@ -493,7 +493,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers var writer = new StringWriter(); // Act - tagHelperContent.WriteTo(writer, new CommonTestEncoder()); + tagHelperContent.WriteTo(writer, new HtmlTestEncoder()); // Assert Assert.Equal("HtmlEncode[[Hi]]", writer.ToString()); @@ -509,7 +509,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers var writer = new StringWriter(); // Act - tagHelperContent.WriteTo(writer, new CommonTestEncoder()); + tagHelperContent.WriteTo(writer, new HtmlTestEncoder()); // Assert Assert.Equal("Hi", writer.ToString()); diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs index d7e41d64d4..2125030590 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.Extensions.WebEncoders.Testing; using Xunit; @@ -48,7 +47,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers Assert.NotNull(tagHelperOutput.PostElement); Assert.Equal( "HtmlEncode[[Hello World]]", - tagHelperOutput.PreElement.GetContent(new CommonTestEncoder())); + tagHelperOutput.PreElement.GetContent(new HtmlTestEncoder())); } [Fact] @@ -66,7 +65,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers Assert.NotNull(tagHelperOutput.PostElement); Assert.Equal( "HtmlEncode[[Hello World]]", - tagHelperOutput.PostElement.GetContent(new CommonTestEncoder())); + tagHelperOutput.PostElement.GetContent(new HtmlTestEncoder())); } [Fact] @@ -107,7 +106,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers Assert.NotNull(tagHelperOutput.PostElement); Assert.Equal( "HtmlEncode[[Hello World]]", - tagHelperOutput.PreContent.GetContent(new CommonTestEncoder())); + tagHelperOutput.PreContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -125,7 +124,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers Assert.NotNull(tagHelperOutput.PostElement); Assert.Equal( "HtmlEncode[[Hello World]]", - tagHelperOutput.Content.GetContent(new CommonTestEncoder())); + tagHelperOutput.Content.GetContent(new HtmlTestEncoder())); } [Fact] @@ -143,7 +142,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers Assert.NotNull(tagHelperOutput.PostElement); Assert.Equal( "HtmlEncode[[Hello World]]", - tagHelperOutput.PostContent.GetContent(new CommonTestEncoder())); + tagHelperOutput.PostContent.GetContent(new HtmlTestEncoder())); } [Fact] @@ -161,15 +160,15 @@ namespace Microsoft.AspNet.Razor.TagHelpers // Assert Assert.Null(tagHelperOutput.TagName); Assert.NotNull(tagHelperOutput.PreElement); - Assert.Empty(tagHelperOutput.PreElement.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PreElement.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.PreContent); - Assert.Empty(tagHelperOutput.PreContent.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PreContent.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.Content); - Assert.Empty(tagHelperOutput.Content.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.Content.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.PostContent); - Assert.Empty(tagHelperOutput.PostContent.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PostContent.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.PostElement); - Assert.Empty(tagHelperOutput.PostElement.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PostElement.GetContent(new HtmlTestEncoder())); } [Fact] @@ -192,15 +191,15 @@ namespace Microsoft.AspNet.Razor.TagHelpers // Assert Assert.NotNull(tagHelperOutput.PreElement); - Assert.Empty(tagHelperOutput.PreElement.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PreElement.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.PreContent); - Assert.Empty(tagHelperOutput.PreContent.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PreContent.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.Content); - Assert.Empty(tagHelperOutput.Content.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.Content.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.PostContent); - Assert.Empty(tagHelperOutput.PostContent.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PostContent.GetContent(new HtmlTestEncoder())); Assert.NotNull(tagHelperOutput.PostElement); - Assert.Empty(tagHelperOutput.PostElement.GetContent(new CommonTestEncoder())); + Assert.Empty(tagHelperOutput.PostElement.GetContent(new HtmlTestEncoder())); } [Theory] diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/project.json b/test/Microsoft.AspNet.Razor.Runtime.Test/project.json index 5633b9860c..f892da1d38 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/project.json +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/project.json @@ -11,7 +11,7 @@ "type": "build", "version": "1.0.0-*" }, - "Microsoft.Extensions.WebEncoders.Testing": "1.0.0-*", + "Microsoft.Extensions.WebEncoders": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": {