Chromium Code Reviews Chromium Code Reviews
Issue 82903007:
Improved HTML parsing (Closed)
Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart| Index: editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/html/parser/HtmlParserTest.java |
| diff --git a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/html/parser/HtmlParserTest.java b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/html/parser/HtmlParserTest.java |
| index c7048b1ad4f6264b2ab6c64267018e09ed7fdd13..7f174deb7d684cf673cbc78edf175d54840e5b2b 100644 |
| --- a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/html/parser/HtmlParserTest.java |
| +++ b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/html/parser/HtmlParserTest.java |
| @@ -14,7 +14,12 @@ |
| package com.google.dart.engine.html.parser; |
| import com.google.dart.engine.EngineTestCase; |
| +import com.google.dart.engine.ast.Expression; |
| +import com.google.dart.engine.ast.SimpleIdentifier; |
| +import com.google.dart.engine.error.GatheringErrorListener; |
| +import com.google.dart.engine.html.ast.EmbeddedExpression; |
| import com.google.dart.engine.html.ast.HtmlUnit; |
| +import com.google.dart.engine.html.ast.XmlAttributeNode; |
| import com.google.dart.engine.html.ast.XmlTagNode; |
| import com.google.dart.engine.html.parser.XmlValidator.Attributes; |
| import com.google.dart.engine.html.parser.XmlValidator.Tag; |
| @@ -85,6 +90,18 @@ public class HtmlParserTest extends EngineTestCase { |
| assertEquals("sdfsdf", bodyNode.getAttributes().get(0).getText()); |
| } |
| + public void test_parse_attribute_withEmbeddedExpression() throws Exception { |
| + HtmlUnit htmlUnit = parse("<html><body foo='{{bar}}'></body></html>").getHtmlUnit(); |
|
danrubel
2013/11/25 02:26:12
TODO add test with missing }}
Brian Wilkerson
2013/11/25 19:04:36
TODO added. Not sure what to test, though, since w
|
| + XmlTagNode htmlNode = htmlUnit.getTagNodes().get(0); |
| + XmlTagNode bodyNode = htmlNode.getTagNodes().get(0); |
| + XmlAttributeNode attribute = bodyNode.getAttributes().get(0); |
| + EmbeddedExpression[] expressions = attribute.getExpressions(); |
| + assertLength(1, expressions); |
| + Expression expression = expressions[0].getExpression(); |
| + assertInstanceOf(SimpleIdentifier.class, expression); |
| + assertEquals("bar", ((SimpleIdentifier) expression).getName()); |
| + } |
| + |
| public void test_parse_comment_embedded() throws Exception { |
| HtmlUnit htmlUnit = parse(// |
| "<html <!-- comment -->></html>").getHtmlUnit(); |
| @@ -116,6 +133,18 @@ public class HtmlParserTest extends EngineTestCase { |
| validate(htmlUnit, t("html", "<p/>blat<p/>", t("p", ""), t("p", ""))); |
| } |
| + public void test_parse_content_withEmbeddedExpression() throws Exception { |
| + HtmlUnit htmlUnit = parse("<html><body><p>abc {{elipsis}}} xyz</p></body></html>").getHtmlUnit(); |
|
danrubel
2013/11/25 02:26:12
Three } ... intentional?
TODO test with missing }
Brian Wilkerson
2013/11/25 19:04:36
Nope. Fixed.
|
| + XmlTagNode htmlNode = htmlUnit.getTagNodes().get(0); |
| + XmlTagNode bodyNode = htmlNode.getTagNodes().get(0); |
| + XmlTagNode pNode = bodyNode.getTagNodes().get(0); |
| + EmbeddedExpression[] expressions = pNode.getExpressions(); |
| + assertLength(1, expressions); |
| + Expression expression = expressions[0].getExpression(); |
| + assertInstanceOf(SimpleIdentifier.class, expression); |
| + assertEquals("elipsis", ((SimpleIdentifier) expression).getName()); |
| + } |
| + |
| public void test_parse_declaration() throws Exception { |
| HtmlUnit htmlUnit = parse(// |
| "<!DOCTYPE html>\n\n<html><p></p></html>").getHtmlUnit(); |
| @@ -195,7 +224,9 @@ public class HtmlParserTest extends EngineTestCase { |
| HtmlScanner scanner = new HtmlScanner(source); |
| source.getContents(scanner); |
| HtmlScanResult scanResult = scanner.getResult(); |
| - HtmlParseResult result = new HtmlParser(source).parse(scanResult); |
| + GatheringErrorListener errorListener = new GatheringErrorListener(); |
| + HtmlParseResult result = new HtmlParser(source, errorListener).parse(scanResult); |
| + errorListener.assertNoErrors(); |
| return result; |
| } |
