From b3364db53e73c5416720e99412e33e182393d324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Wang?= <fwang@igalia.com>
Date: Sat, 3 Oct 2020 10:30:36 +0000
Subject: [PATCH] Bug 1668204 [wpt PR 25871] - Tweak some subsup tests to make
 them less strict, a=testonly

Automatic update from web-platform-tests
Tweak some subsup tests to make them less strict (#25871)

These tests are sometimes failing on firefox locally, because they
depend on the font used. Also the rules when a MATH table is not
used are not clear yet and spec and implementations differ. This
commit tweaks subsup tests so that:

- They use Ahem rather than system fonts.
- Error is relaxed.
- position of sup/sup script is checked to be above/below the middle
  of the base than close to the top/bottom of the base.
--

wpt-commits: a1d3637978a5de61b2b6008fa9fdbae1682c7e4d
wpt-pr: 25871
---
 .../presentation-markup/scripts/subsup-1.html | 22 +++++++-------
 .../presentation-markup/scripts/subsup-2.html | 30 +++++++++----------
 .../presentation-markup/scripts/subsup-3.html | 10 +++----
 3 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html
index e5321d6c4a3c..1c3b04dd4169 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html
@@ -8,15 +8,15 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   math, mspace {
-    font-size: 10px;
+    font: 25px/1 Ahem;
   }
 </style>
 <script>
-  /* This test does not use any specific fonts and so the exact rules are not
-  specified precisely. We assume reasonable values for script shifts and
-  spacing. */
+  /* This test does not use a font with a MATH table and does not verify layout
+     rules in a very strict way. */
 
   function getBox(aId) {
     var box = document.getElementById(aId).getBoundingClientRect();
@@ -25,7 +25,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", runTests);
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
@@ -57,17 +57,16 @@
     test(function() {
       assert_true(MathMLFeatureDetection.has_mspace());
 
-      var e = 3;
-      assert_approx_equals(getBox("msubSub").middle, getBox("msubBase").bottom, e, "msub: script is placed at the bottom of the base");
-      assert_approx_equals(getBox("msupSup").middle, getBox("msupBase").top, e, "msup: script is placed at the top of the base");
-      assert_approx_equals(getBox("msubsupSub").middle, getBox("msubsupBase").bottom, e, "msubsup: script is placed at the bottom of the base");
-      assert_approx_equals(getBox("msubsupSup").middle, getBox("msubsupBase").top, e, "msubsup: script is placed at the top of the base");
+      assert_greater_than(getBox("msubSub").middle, getBox("msubBase").middle, "msub: script is placed at the bottom of the base");
+      assert_less_than(getBox("msupSup").middle, getBox("msupBase").middle, "msup: script is placed at the top of the base");
+      assert_greater_than(getBox("msubsupSub").middle, getBox("msubsupBase").middle, "msubsup: script is placed at the bottom of the base");
+      assert_less_than(getBox("msubsupSup").middle, getBox("msubsupBase").middle, "msubsup: script is placed at the top of the base");
     }, "Vertical position of scripts");
 
     test(function() {
       assert_true(MathMLFeatureDetection.has_mspace());
 
-      var e = 3;
+      var e = 5;
       assert_approx_equals(getBox("msub").width, getBox("msubSub").right - getBox("msubBase").left, e, "msub: width is determined by the left/right sides of base/script (+ some space after script)");
       assert_approx_equals(getBox("msup").width, getBox("msupSup").right - getBox("msupBase").left, e, "msup: width is determined by the left/right sides of base/script (+ some space after script)");
       assert_approx_equals(getBox("msubsup").width, Math.max(getBox("msubsupSub").right, getBox("msubsupSup").right) - getBox("msubsupBase").left, e, "msubsup: width is determined by the left/right sides of base/scripts (+ some space after script)");
@@ -81,7 +80,6 @@
       assert_greater_than_equal(getBox("msup").height, getBox("msupBase").height, e, "msup: height is at least the one of the base");
       assert_greater_than_equal(getBox("msubsup").height, getBox("msubsupBase").height, e, "msubsup: height is at least the one of the base");
 
-      e = 3;
       assert_approx_equals(getBox("msub").height, Math.max(getBox("msubSub").bottom, getBox("msubBase").bottom) - getBox("msubBase").top, e, "msub: height is determined by the top/bottom sides of base/scripts");
       assert_approx_equals(getBox("msup").height, getBox("msupBase").bottom - Math.min(getBox("msupSup").top, getBox("msupBase").top), e, "msup: height is determined by the top/bottom sides of base/scripts");
       assert_approx_equals(getBox("msubsup").height, Math.max(getBox("msubSub").bottom, getBox("msubBase").bottom) - Math.min(getBox("msupSup").top, getBox("msupBase").top), e, "msubsup: height is determined by the top/bottom sides of base/scripts");
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html
index 1a5b80d34397..d6a48b94f128 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html
@@ -8,15 +8,15 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   math, mspace {
-    font-size: 10px;
+    font: 25px/1 Ahem;
   }
 </style>
 <script>
-  /* This test does not use any specific fonts and so the exact rules are not
-  specified precisely. We assume reasonable values for script shifts and
-  spacing. */
+  /* This test does not use a font with a MATH table and does not verify layout
+     rules in a very strict way. */
 
   function getBox(aId) {
     var box = document.getElementById(aId).getBoundingClientRect();
@@ -25,7 +25,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", runTests);
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
@@ -71,16 +71,15 @@
     test(function() {
       assert_true(MathMLFeatureDetection.has_mspace());
 
-      var e = 3;
-      assert_approx_equals(getBox("msubSub").middle, getBox("msubBase").bottom, e, "script is placed at the bottom of the base");
-      assert_approx_equals(getBox("msupSup").middle, getBox("msupBase").top, e, "script is placed at the top of the base");
-      assert_approx_equals(getBox("msubsupSub").middle, getBox("msubsupBase").bottom, e, "script is placed at the bottom of the base");
-      assert_approx_equals(getBox("msubsupSup").middle, getBox("msubsupBase").top, e, "script is placed at the top of the base");
+      assert_greater_than(getBox("msubSub").middle, getBox("msubBase").middle, "script is placed at the bottom of the base");
+      assert_less_than(getBox("msupSup").middle, getBox("msupBase").middle, "script is placed at the top of the base");
+      assert_greater_than(getBox("msubsupSub").middle, getBox("msubsupBase").middle, "script is placed at the bottom of the base");
+      assert_less_than(getBox("msubsupSup").middle, getBox("msubsupBase").middle, "script is placed at the top of the base");
 
-      assert_approx_equals(getBox("premsubSub").middle, getBox("premsubBase").bottom, e, "script is placed at the bottom of the base");
-      assert_approx_equals(getBox("premsupSup").middle, getBox("premsupBase").top, e, "script is placed at the top of the base");
-      assert_approx_equals(getBox("premsubsupSub").middle, getBox("premsubsupBase").bottom, e, "script is placed at the bottom of the base");
-      assert_approx_equals(getBox("premsubsupSup").middle, getBox("premsubsupBase").top, e, "script is placed at the top of the base");
+      assert_greater_than(getBox("premsubSub").middle, getBox("premsubBase").middle, "script is placed at the bottom of the base");
+      assert_less_than(getBox("premsupSup").middle, getBox("premsupBase").middle, "script is placed at the top of the base");
+      assert_greater_than(getBox("premsubsupSub").middle, getBox("premsubsupBase").middle, "script is placed at the bottom of the base");
+      assert_less_than(getBox("premsubsupSup").middle, getBox("premsubsupBase").middle, "script is placed at the top of the base");
     }, "Vertical position of scripts");
 
     test(function() {
@@ -99,7 +98,7 @@
     test(function() {
       assert_true(MathMLFeatureDetection.has_mspace());
 
-      var e = 1;
+      var e = 5;
       assert_greater_than_equal(getBox("msub").height, getBox("msubBase").height, e, "height is at least the one of the base");
       assert_greater_than_equal(getBox("msup").height, getBox("msupBase").height, e, "height is at least the one of the base");
       assert_greater_than_equal(getBox("msubsup").height, getBox("msubsupBase").height, e, "height is at least the one of the base");
@@ -107,7 +106,6 @@
       assert_greater_than_equal(getBox("premsup").height, getBox("premsupBase").height, e, "height is at least the one of the base");
   assert_greater_than_equal(getBox("premsubsup").height, getBox("premsubsupBase").height, e, "height is at least the one of the base");
 
-      e = 3;
       assert_approx_equals(getBox("msub").height, Math.max(getBox("msubSub").bottom, getBox("msubBase").bottom) - getBox("msubBase").top, e, "msub height is determined by the top/bottom sides of base/scripts");
       assert_approx_equals(getBox("msup").height, getBox("msupBase").bottom - Math.min(getBox("msupSup").top, getBox("msupBase").top), e, "msup height is determined by the top/bottom sides of base/scripts");
       assert_approx_equals(getBox("msubsup").height, Math.max(getBox("msubSub").bottom, getBox("msubBase").bottom) - Math.min(getBox("msupSup").top, getBox("msupBase").top), e, "msubsup height is determined by the top/bottom sides of base/scripts");
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html
index 5494bb0c919c..37815cba78cc 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html
@@ -8,15 +8,15 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   math, mspace {
-    font-size: 10px;
+    font: 25px/1 Ahem;
   }
 </style>
 <script>
-  /* This test does not use any specific fonts and so the exact rules are not
-  specified precisely. We assume reasonable values for script shifts and
-  spacing. */
+  /* This test does not use a font with a MATH table and does not verify layout
+     rules in a very strict way. */
 
   function getBox(aId) {
     var box = document.getElementById(aId).getBoundingClientRect();
@@ -25,7 +25,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", runTests);
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {