Update entities test from prior PR (3081) feedback (#3117)

web-platform-tests · Aug 15, 2016 · dc6a657 · dc6a657
1 parent ec05591
commit dc6a657
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 17 deletions.
diff --git a/domparsing/DOMParser-parseFromString-xml-doctype.html b/domparsing/DOMParser-parseFromString-xml-doctype.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>HTML entities for various XHTML Doctype variants</title>
+<link rel=help href="http://w3c.github.io/html/xhtml.html#parsing-xhtml-documents">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+  test(function () {
+    var doc = new DOMParser().parseFromString('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"><html><div id="test"/></html>', 'application/xhtml+xml');
+    var div = doc.getElementById('test');
+    assert_equals(div, null); // If null, then this was a an error document (didn't parse the input successfully)
+  }, "Doctype parsing of System Id must fail on ommitted value");
+
+  test(function () {
+    var doc = new DOMParser().parseFromString('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ""><html><div id="test"/></html>', 'application/xhtml+xml');
+    var div = doc.getElementById('test');
+    assert_not_equals(div, null); // If found, then the DOMParser didn't generate an error document
+  }, "Doctype parsing of System Id can handle empty string");
+
+  test(function () {
+    var doc = new DOMParser().parseFromString('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "x"><html><div id="test"/></html>', 'application/xhtml+xml');
+    var div = doc.getElementById('test');
+    assert_not_equals(div, null);
+  }, "Doctype parsing of System Id can handle a quoted value");
+
+</script>
diff --git a/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-support.htm b/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-support.htm
@@ -9,9 +9,16 @@
   var parser = new DOMParser();
   var parse = parser.parseFromString.bind(parser);
 
-  function generateTestFunction(entitystring, expectedString, doctypeMarkupString, mimeType, friendlyMime) {
+  function generateTestFunction(entitystring, expectedString, publicId, systemId, mimeType, friendlyMime) {
     return function () {
-      var doc = parse(doctypeMarkupString + "<html><head></head><body id='test'>"+entitystring+"</body></html>", mimeType);
+      var doctypeString = '<!DOCTYPE html';
+      if (publicId != null)
+        doctypeString += ' PUBLIC "' + publicId + '" "' + systemId + '">';
+      else if (systemId != null)
+        doctypeString += ' SYSTEM "' + systemId + '">';
+      else // both are null
+        doctypeString += '>';
+      var doc = parse(doctypeString + "<html><head></head><body id='test'>"+entitystring+"</body></html>", mimeType);
       var root = doc.getElementById('test');
       assert_not_equals(root, null, friendlyMime + " parsing the entity reference caused a parse error;");
       assert_true(!!root.firstChild);
@@ -24,10 +31,10 @@
     }
   }
 
-  function setupTests(jsonEntities, doctypeMarkupString, mimeType, friendlyMime) {
+  function setupTests(jsonEntities, publicId, systemId, mimeType, friendlyMime) {
     for (entityName in jsonEntities) {
       if ((mimeType == "text/html") || /;$/.test(entityName)) {
-        test(generateTestFunction(entityName, jsonEntities[entityName].characters, doctypeMarkupString, mimeType, friendlyMime), friendlyMime + " parsing " + entityName);
+        test(generateTestFunction(entityName, jsonEntities[entityName].characters, publicId, systemId, mimeType, friendlyMime), friendlyMime + " parsing " + entityName);
       }
     }
   }
@@ -37,22 +44,21 @@
   var xhr = new XMLHttpRequest();
   xhr.open("GET", "/common/entities.json");
   xhr.onload = function () {
-    // Note: for proper XML parsing of the Doctype, Edge requires a non-empty string for url part
     var entitiesJSON = JSON.parse(xhr.response);
     [
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"foo\">", "XHTML1.0 Transitional"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"foo\">", "XHTML1.1"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"foo\">", "XHTML1.0 Strict"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"foo\">", "XHTML1.0 Frameset"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML Basic 1.0//EN\" \"foo\">", "XHTML Basic"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" \"foo\">", "XHTML1.1+MathML"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN\" \"foo\">", "XHTML1.1+MathML+SVG"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//W3C//DTD MathML 2.0//EN\" \"foo\">", "MathML"],
-      ["application/xhtml+xml", "<!DOCTYPE html PUBLIC \"-//WAPFORUM//DTD XHTML Mobile 1.0//EN\" \"foo\">", "XHTML Mobile"],
-//      ["application/xhtml+xml", "<!DOCTYPE html SYSTEM \"mathml.dtd\">", "SYSTEM MathML"], // Experimental
-      ["text/html", "<!DOCTYPE html>", "HTML"]
+      ["application/xhtml+xml", "-//W3C//DTD XHTML 1.0 Transitional//EN", "foo", "XHTML1.0 Transitional"],
+      ["application/xhtml+xml", "-//W3C//DTD XHTML 1.1//EN", "foo", "XHTML1.1"],
+      ["application/xhtml+xml", "-//W3C//DTD XHTML 1.0 Strict//EN", "foo", "XHTML1.0 Strict"],
+      ["application/xhtml+xml", "-//W3C//DTD XHTML 1.0 Frameset//EN", "foo", "XHTML1.0 Frameset"],
+      ["application/xhtml+xml", "-//W3C//DTD XHTML Basic 1.0//EN", "foo", "XHTML Basic"],
+      ["application/xhtml+xml", "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", "foo", "XHTML1.1+MathML"],
+      ["application/xhtml+xml", "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN", "foo", "XHTML1.1+MathML+SVG"],
+      ["application/xhtml+xml", "-//W3C//DTD MathML 2.0//EN", "foo", "MathML"],
+      ["application/xhtml+xml", "-//WAPFORUM//DTD XHTML Mobile 1.0//EN", "foo", "XHTML Mobile"],
+//      ["application/xhtml+xml", null, "mathml.dtd", "SYSTEM MathML"], // Experimental
+      ["text/html", null, null, "HTML"]
     ].forEach(function (row) {
-      setupTests(entitiesJSON, row[1], row[0], row[2]);
+      setupTests(entitiesJSON, row[1], row[2], row[0], row[3]);
     });
     done();
   }