Fix failing linemappings tests

Need to use a consistent newline, since these fail on xplat.
This commit is contained in:
Ryan Nowak 2017-01-31 12:41:54 -08:00
parent 705369ee51
commit 6c55754823
1 changed files with 11 additions and 9 deletions

View File

@ -14,7 +14,7 @@ using ErrorSink = Microsoft.AspNetCore.Razor.Evolution.Legacy.ErrorSink;
namespace Microsoft.AspNetCore.Mvc.Razor.Host namespace Microsoft.AspNetCore.Mvc.Razor.Host
{ {
public class MvcTagHelperAttributeValueCodeRendererTest public class ModelExpressionPassTest
{ {
[Fact] [Fact]
public void ModelExpressionPass_NonModelExpressionProperty_Ignored() public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
@ -66,9 +66,10 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Host
public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression() public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
{ {
// Arrange // Arrange
var codeDocument = CreateDocument(@"
@addTagHelper TestTagHelper, TestAssembly // Using \r\n here because we verify line mappings
<p foo=""Bar"">"); var codeDocument = CreateDocument(
"@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"Bar\">");
var tagHelpers = new[] var tagHelpers = new[]
{ {
@ -109,16 +110,17 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Host
var originalNode = Assert.IsType<CSharpTokenIRNode>(expression.Children[2]); var originalNode = Assert.IsType<CSharpTokenIRNode>(expression.Children[2]);
Assert.Equal("Bar", originalNode.Content); Assert.Equal("Bar", originalNode.Content);
Assert.Equal(new SourceSpan("test.cshtml", 53, 2, 8, 3), originalNode.Source.Value); Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), originalNode.Source.Value);
} }
[Fact] [Fact]
public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression() public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
{ {
// Arrange // Arrange
var codeDocument = CreateDocument(@"
@addTagHelper TestTagHelper, TestAssembly // Using \r\n here because we verify line mappings
<p foo=""@Bar"">"); var codeDocument = CreateDocument(
"@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"@Bar\">");
var tagHelpers = new[] var tagHelpers = new[]
{ {
@ -159,7 +161,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Host
var originalNode = Assert.IsType<CSharpTokenIRNode>(expression.Children[1]); var originalNode = Assert.IsType<CSharpTokenIRNode>(expression.Children[1]);
Assert.Equal("Bar", originalNode.Content); Assert.Equal("Bar", originalNode.Content);
Assert.Equal(new SourceSpan("test.cshtml", 54, 2, 9, 3), originalNode.Source.Value); Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), originalNode.Source.Value);
} }
private RazorCodeDocument CreateDocument(string content) private RazorCodeDocument CreateDocument(string content)