From 6c961c6c22e5ce53734618a1cb56706b15183c69 Mon Sep 17 00:00:00 2001 From: "fred.wang@free.fr" Date: Thu, 7 Jul 2016 14:29:25 +0000 Subject: [PATCH] Replace reftest scripts-height.html with script tests https://bugs.webkit.org/show_bug.cgi?id=159423 We import a test from the MathML in HTML5 test suite to replace the test scripts-height.html and make results more reliable, explicit and accurate. This avoids the failure on iOS. Patch by Frederic Wang on 2016-07-07 Reviewed by Martin Robinson. * imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4-expected.txt: Added. * imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4.html: Added. * mathml/presentation/scripts-height.html: Removed. * platform/ios-simulator/TestExpectations: Remove failure expectation. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202907 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 15 +++ .../scripts/subsup-4-expected.txt | 4 + .../presentation-markup/scripts/subsup-4.html | 124 +++++++++++++++++++++ .../mathml/presentation/scripts-height.html | 96 ---------------- .../platform/ios-simulator/TestExpectations | 3 - 5 files changed, 143 insertions(+), 99 deletions(-) create mode 100644 LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4-expected.txt create mode 100644 LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4.html delete mode 100644 LayoutTests/mathml/presentation/scripts-height.html diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 50ef635..697334f 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,5 +1,20 @@ 2016-07-07 Frederic Wang + Replace reftest scripts-height.html with script tests + https://bugs.webkit.org/show_bug.cgi?id=159423 + + We import a test from the MathML in HTML5 test suite to replace the test scripts-height.html + and make results more reliable, explicit and accurate. This avoids the failure on iOS. + + Reviewed by Martin Robinson. + + * imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4-expected.txt: Added. + * imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4.html: Added. + * mathml/presentation/scripts-height.html: Removed. + * platform/ios-simulator/TestExpectations: Remove failure expectation. + +2016-07-07 Frederic Wang + Replace multiscripts-positions.html reftest with script tests https://bugs.webkit.org/show_bug.cgi?id=159418 diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4-expected.txt b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4-expected.txt new file mode 100644 index 0000000..72de8d6 --- /dev/null +++ b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4-expected.txt @@ -0,0 +1,4 @@ + +PASS Alignment on the baseline for bases of different heights +PASS Vertical position of the scripts for bases of different heights + diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4.html new file mode 100644 index 0000000..14d474a --- /dev/null +++ b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-4.html @@ -0,0 +1,124 @@ + + + + +Subscripts and Superscripts metrics + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+
+ + diff --git a/LayoutTests/mathml/presentation/scripts-height.html b/LayoutTests/mathml/presentation/scripts-height.html deleted file mode 100644 index 901a316..0000000 --- a/LayoutTests/mathml/presentation/scripts-height.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - scripts-height - - - - - - -
- - - - -
- - - - - - - -
-
-
- - - - -
- -
-
-
- - - - -
- -
-
- - -
- - - - -
- - - - - - - - - - - - - - - - - - - -
-
- - - diff --git a/LayoutTests/platform/ios-simulator/TestExpectations b/LayoutTests/platform/ios-simulator/TestExpectations index be1a1ec..3a0ef47 100644 --- a/LayoutTests/platform/ios-simulator/TestExpectations +++ b/LayoutTests/platform/ios-simulator/TestExpectations @@ -675,9 +675,6 @@ mathml/opentype/large-operators-italic-correction.html [ Skip ] mathml/presentation/attributes-mathvariant.html [ Skip ] mathml/presentation/tokenElements-mathvariant.html [ Skip ] -# MathML tests that fail: -mathml/presentation/scripts-height.html [ ImageOnlyFailure ] - # ASSERT(m_cgFont.get()) fails in FontPlatformData::ctFont() svg/text/svg-fallback-font-crash.html svg/css/font-face-variant-crash.html -- 1.8.3.1