Skip to content

Commit

Permalink
[LayoutTests] Rebaseline text tests with pixel refs
Browse files Browse the repository at this point in the history
rdar://127396069
https://bugs.webkit.org/show_bug.cgi?id=273595

Reviewed by Sam Sneddon.

There are a number of text based tests which have pixel refs. Since these tests explicitly
dumpText, they cannot also be pixel tests.

* LayoutTests/TestExpectations:
* LayoutTests/imported/w3c/web-platform-tests/css/css-break/relpos-inline-hit-testing-expected.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-break/relpos-inline-hit-testing-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-004-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-004-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-005-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-005-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-001-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-001-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-002-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-002-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-003-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-003-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell-expected.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mathml/relations/css-styling/width-height-004-expected.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/mathml/relations/css-styling/width-height-004-expected.txt: Added.
* LayoutTests/platform/ios/TestExpectations:
* LayoutTests/platform/mac/TestExpectations:

Canonical link: https://commits.webkit.org/278402@main
  • Loading branch information
JonWBedard committed May 6, 2024
1 parent c4ec1ae commit 67855f6
Show file tree
Hide file tree
Showing 19 changed files with 138 additions and 341 deletions.
8 changes: 0 additions & 8 deletions LayoutTests/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -1562,8 +1562,6 @@ webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-si
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-001.html [ ImageOnlyFailure ]
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-002.html [ ImageOnlyFailure ]
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-003.html [ ImageOnlyFailure ]
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-004.html [ ImageOnlyFailure ]
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-005.html [ ImageOnlyFailure ]
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-006.html [ ImageOnlyFailure ]
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-007.html [ ImageOnlyFailure ]
webkit.org/b/116117 imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-008.html [ ImageOnlyFailure ]
Expand Down Expand Up @@ -1807,7 +1805,6 @@ imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-marg
imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/mathml/relations/css-styling/width-height-002.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/mathml/relations/css-styling/width-height-003.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/mathml/relations/css-styling/width-height-004.html [ ImageOnlyFailure ]

# This MathML test should be rewritten.
webkit.org/b/201356 mathml/presentation/stretchy-depth-height-symmetric.html [ Skip ]
Expand Down Expand Up @@ -6530,9 +6527,6 @@ imported/w3c/web-platform-tests/css/css-tables/absolute-tables-015.html [ ImageO
imported/w3c/web-platform-tests/css/css-tables/anonymous-table-ws-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/box-shadow-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/col-definite-min-size-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/colspan-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/colspan-002.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/colspan-003.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-002.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-003.html [ ImageOnlyFailure ]
Expand All @@ -6542,7 +6536,6 @@ imported/w3c/web-platform-tests/css/css-tables/height-distribution/extra-height-
imported/w3c/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-005.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-006.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/min-max-size-table-content-box.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/rules-groups.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/table-cell-baseline-static-position.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-tables/table-has-box-sizing-border-box-002.html [ ImageOnlyFailure ]
Expand Down Expand Up @@ -7132,7 +7125,6 @@ imported/w3c/web-platform-tests/css/css-break/overflowed-block-with-no-room-afte
imported/w3c/web-platform-tests/css/css-break/overflowed-block-with-no-room-after-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-break/parallel-flow-trailing-margin-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-break/parallel-flow-trailing-margin-002.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-break/relpos-inline-hit-testing.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-break/relpos-inline.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-break/rounded-clipped-border.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-break/ruby-002.html [ ImageOnlyFailure ]
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@



line1
line2
line3
line4

FAIL line1 assert_equals: expected Element node <span id="target">
line1<br>
line2<br>
line3<... but got Element node <html><head><link rel="author" title="Morten Stenshorne" ...
FAIL line2 assert_equals: expected Element node <span id="target">
line1<br>
line2<br>
line3<... but got Element node <html><head><link rel="author" title="Morten Stenshorne" ...
FAIL line3 assert_equals: expected Element node <span id="target">
line1<br>
line2<br>
line3<... but got Element node <html><head><link rel="author" title="Morten Stenshorne" ...
FAIL line4 assert_equals: expected Element node <span id="target">
line1<br>
line2<br>
line3<... but got Element node <html><head><link rel="author" title="Morten Stenshorne" ...
PASS Above line1
PASS Below line4
PASS line1 before offsetting

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

PASS body > div 1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

FAIL body > div 1 assert_equals:
<div style="display: flex; flex-flow: column wrap; width: max-content; height: 100px; background: green; position: relative;" data-expected-width="250">
<div class="item" style="width: 100px;"></div>
<div class="item" style="width: fit-content;" data-expected-width="150" data-offset-x="100">
<!-- This item has min-content=75 and max-content=150. -->
<div class="grandchild"></div>
<div class="grandchild"></div>
</div>
</div>
width expected 250 but got 150

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
There should be five squares.


FAIL td 1 assert_equals:
<td colspan="2" style="background:blue;" data-expected-width="75" data-expected-height="75">
<div style="width:50px; height:75px;"></div>
</td>
width expected 75 but got 100
FAIL td 2 assert_equals:
<td colspan="2" style="background:green;" data-expected-width="75" data-expected-height="75">
<div style="width:50px; height:75px;"></div>
</td>
width expected 75 but got 50
PASS td 3
PASS td 4
PASS td 5

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
There should be five squares.


FAIL td 1 assert_equals:
<td colspan="3" style="background:blue;" data-expected-width="75" data-expected-height="75">
<div style="width:50px; height:75px;"></div>
</td>
width expected 75 but got 100
FAIL td 2 assert_equals:
<td colspan="3" style="background:green;" data-expected-width="75" data-expected-height="75">
<div style="width:50px; height:75px;"></div>
</td>
width expected 75 but got 50
PASS td 3
PASS td 4
PASS td 5

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
There should be five squares.


FAIL td 1 assert_equals:
<td colspan="10" style="background:blue;" data-expected-width="75" data-expected-height="75">
<div style="width:50px; height:75px;"></div>
</td>
width expected 75 but got 100
FAIL td 2 assert_equals:
<td colspan="10" style="background:green;" data-expected-width="75" data-expected-height="75">
<div style="width:50px; height:75px;"></div>
</td>
width expected 75 but got 50
PASS td 3
PASS td 4
PASS td 5

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
There should be a 100px tall pink block below, with a scrollable box inside.


PASS #container 1

Loading

0 comments on commit 67855f6

Please sign in to comment.