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

Make `HtmlContentIRNode` content newlines platform agnostic. 

- Prior to this the platform that the newlines were escaped on would be the platform the baselines would pass on.
- Updated baselines to reflect new newline escaping.

#888
This commit is contained in:
N. Taylor Mullen 2016-12-08 10:45:30 -08:00
parent 34ef31356f
commit f09fd291a7
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
@ -155,9 +156,10 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
return;
}
// We explicitly escape newlines in node content so that the IR can be compared line-by-line.
// We explicitly escape newlines in node content so that the IR can be compared line-by-line. The escaped
// newline cannot be platform specific so we need to drop the windows \r.
// Also, escape our separator so we can search for ` - `to find delimiters.
_writer.Write(content.Replace("\r", "\\r").Replace("\n", "\\n").Replace("-", "\\-"));
_writer.Write(content.Replace("\r", string.Empty).Replace("\n", "\\n").Replace(" - ", "\\-"));
}
}
}

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt
View File

@ -2,9 +2,9 @@ Document -
NamespaceDeclaration - -
ClassDeclaration - - - - -
RazorMethodDeclaration - - - - -
HtmlContent - (0:0,0 [6] ) - <html>\r\n<body>\r\n <span
HtmlContent - (0:0,0 [6] ) - <html>\n<body>\n <span
HtmlAttribute - (25:2,9 [13] ) - val=" - "
CSharpAttributeValue - (31:2,15 [6] ) -
CSharpExpression - (32:2,16 [5] )
CSharpToken - (32:2,16 [5] ) - Hello
HtmlContent - (38:2,22 [3] ) - />\r\n</body>\r\n</html>"
HtmlContent - (38:2,22 [3] ) - />\n</body>\n</html>"

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt
View File

@ -2,7 +2,7 @@ Document -
NamespaceDeclaration - -
ClassDeclaration - - - - -
RazorMethodDeclaration - - - - -
HtmlContent - (0:0,0 [6] ) - <html>\r\n<body>\r\n <span data\-val="
HtmlContent - (0:0,0 [6] ) - <html>\n<body>\n <span data-val="
CSharpExpression - (37:2,21 [5] )
CSharpToken - (37:2,21 [5] ) - Hello
HtmlContent - (42:2,26 [1] ) - " />\r\n</body>\r\n</html>"
HtmlContent - (42:2,26 [1] ) - " />\n</body>\n</html>"