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

Fix tests on Windows with `core.autocrlf=input` 

- #5907
This commit is contained in:
Doug Bunting 2017-03-05 22:35:34 -08:00
parent b6a6b50776
commit 3fe0b569d6
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/ViewComponentTagHelperPassTest.cs
View File

@ -111,7 +111,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Host
Assert.Equal(3, @class.Children.Count); Assert.Equal(3, @class.Children.Count);
var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]); var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
Assert.Equal(@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")] Assert.Equal(
@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
{ {
private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null; private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
@ -130,7 +131,9 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
output.Content.SetHtmlContent(content); output.Content.SetHtmlContent(content);
} }
} }
", vcthClass.Content); ",
vcthClass.Content,
ignoreLineEndingDifferences: true);
} }
[Fact] [Fact]
@ -192,7 +195,8 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
Assert.Equal(3, @class.Children.Count); Assert.Equal(3, @class.Children.Count);
var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]); var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
Assert.Equal(@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")] Assert.Equal(
@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
{ {
private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null; private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
@ -212,7 +216,9 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
output.Content.SetHtmlContent(content); output.Content.SetHtmlContent(content);
} }
} }
", vcthClass.Content); ",
vcthClass.Content,
ignoreLineEndingDifferences: true);
} }
[Fact] [Fact]
@ -286,7 +292,8 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
Assert.Equal(3, @class.Children.Count); Assert.Equal(3, @class.Children.Count);
var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]); var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
Assert.Equal(@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")] Assert.Equal(
@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
{ {
private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null; private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
@ -305,7 +312,9 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
output.Content.SetHtmlContent(content); output.Content.SetHtmlContent(content);
} }
} }
", vcthClass.Content); ",
vcthClass.Content,
ignoreLineEndingDifferences: true);
} }
private RazorCodeDocument CreateDocument(string content) private RazorCodeDocument CreateDocument(string content)

3
test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
View File

@ -14,7 +14,8 @@ namespace TagHelpersWebSite
var resultString = DanString var resultString = DanString
.Replace("#", colorReplacement) .Replace("#", colorReplacement)
.Replace(Environment.NewLine, "<br>"); .Replace(Environment.NewLine, "<br>")
.Replace("\n", "<br>");
return View<string>(resultString); return View<string>(resultString);
} }