From 67b5588185b96b81c4ec457085dc6b14ea592d2b Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 27 Jun 2018 14:42:00 -0700 Subject: [PATCH] Convert CSharpWhitespaceHandlingTest to use baselines. #2263 --- .../Legacy/CSharpWhitespaceHandlingTest.cs | 24 +++++-------------- ...nesAreSignificantToAncestor.syntaxtree.txt | 22 +++++++++++++++++ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StatementBlockDoesNotAcceptTrailingNewlineIfNewlinesAreSignificantToAncestor.syntaxtree.txt diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs index d33ad7d8c7..0542b64bcb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs @@ -8,27 +8,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public class CSharpWhitespaceHandlingTest : CsHtmlMarkupParserTestBase { + public CSharpWhitespaceHandlingTest() + { + UseBaselineTests = true; + } + [Fact] public void StatementBlockDoesNotAcceptTrailingNewlineIfNewlinesAreSignificantToAncestor() { - ParseBlockTest("@: @if (true) { }" + Environment.NewLine - + "}", - new MarkupBlock( - Factory.MarkupTransition() - .Accepts(AcceptedCharactersInternal.None), - Factory.MetaMarkup(":", HtmlSymbolType.Colon), - Factory.Markup(" ") - .With(new SpanEditHandler( - CSharpLanguageCharacteristics.Instance.TokenizeString, - AcceptedCharactersInternal.Any)), - new StatementBlock( - Factory.CodeTransition() - .Accepts(AcceptedCharactersInternal.None), - Factory.Code("if (true) { }") - .AsStatement() - ), - Factory.Markup(Environment.NewLine) - .Accepts(AcceptedCharactersInternal.None))); + ParseBlockTest("@: @if (true) { }" + Environment.NewLine + "}"); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StatementBlockDoesNotAcceptTrailingNewlineIfNewlinesAreSignificantToAncestor.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StatementBlockDoesNotAcceptTrailingNewlineIfNewlinesAreSignificantToAncestor.syntaxtree.txt new file mode 100644 index 0000000000..a262df6c3a --- /dev/null +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StatementBlockDoesNotAcceptTrailingNewlineIfNewlinesAreSignificantToAncestor.syntaxtree.txt @@ -0,0 +1,22 @@ +Markup block - Gen - 19 - (0:0,0) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 + HtmlSymbolType.Transition;[@]; + MetaCode span - Gen - [:] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:1 + HtmlSymbolType.Colon;[:]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 + HtmlSymbolType.WhiteSpace;[ ]; + Statement block - Gen - 14 - (3:0,3) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Symbols:1 + CSharpSymbolType.Transition;[@]; + Code span - Gen - [if (true) { }] - SpanEditHandler;Accepts:Any - (4:0,4) - Symbols:9 + CSharpSymbolType.Keyword;[if]; + CSharpSymbolType.WhiteSpace;[ ]; + CSharpSymbolType.LeftParenthesis;[(]; + CSharpSymbolType.Keyword;[true]; + CSharpSymbolType.RightParenthesis;[)]; + CSharpSymbolType.WhiteSpace;[ ]; + CSharpSymbolType.LeftBrace;[{]; + CSharpSymbolType.WhiteSpace;[ ]; + CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (17:0,17) - Symbols:1 + HtmlSymbolType.NewLine;[LF];