From 5190c5be816d3036c94ea18ba7206a3ae445d16b Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 6 Jun 2018 16:30:33 +0000 Subject: [PATCH] Bug 1464875 [wpt PR 11196] - Simplify the CSS Logical tests and prevent the result log from being rotated, a=testonly Automatic update from web-platform-testsMerge pull request #11196 from Loirooriol/css-logical Simplify the CSS Logical tests and prevent the result log from being rotated -- wpt-commits: 206f32ac6b61f478c217e52b3dac9328a6884c89 wpt-pr: 11196 --- testing/web-platform/meta/MANIFEST.json | 17 +- .../css-logical/logicalprops-block-size-vlr.html | 289 +++++++++------------ .../css/css-logical/logicalprops-block-size.html | 286 +++++++++----------- .../css-logical/logicalprops-inline-size-vlr.html | 289 +++++++++------------ .../css/css-logical/logicalprops-inline-size.html | 282 +++++++++----------- .../tests/css/css-logical/resources/style-check.js | 9 - 6 files changed, 490 insertions(+), 682 deletions(-) rewrite testing/web-platform/tests/css/css-logical/logicalprops-block-size-vlr.html (61%) rewrite testing/web-platform/tests/css/css-logical/logicalprops-block-size.html (62%) rewrite testing/web-platform/tests/css/css-logical/logicalprops-inline-size-vlr.html (61%) rewrite testing/web-platform/tests/css/css-logical/logicalprops-inline-size.html (61%) delete mode 100644 testing/web-platform/tests/css/css-logical/resources/style-check.js diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json index c6106d89df5e..b3bf4525b374 100644 --- a/testing/web-platform/meta/MANIFEST.json +++ b/testing/web-platform/meta/MANIFEST.json @@ -250771,11 +250771,6 @@ {} ] ], - "css/css-logical/resources/style-check.js": [ - [ - {} - ] - ], "css/css-masking/OWNERS": [ [ {} @@ -511144,29 +511139,25 @@ "reftest" ], "css/css-logical/logicalprops-block-size-vlr.html": [ - "68a86c5b34cf3769e4cda12ef4d23ecdb523734f", + "b77a4607318ab1c8a1cf292a83618720210cf3cf", "testharness" ], "css/css-logical/logicalprops-block-size.html": [ - "e9597ce04c2b8be8128f9b411e7990bc85d3842a", + "988a75943bfc7bdd61eef33a8527e9476fe0fab9", "testharness" ], "css/css-logical/logicalprops-inline-size-vlr.html": [ - "a0438d0713820ac5ab82f0165af7711f71d91ae6", + "9bd26d717f34f9ebf1f09cbb2eb7c2242df6b3c8", "testharness" ], "css/css-logical/logicalprops-inline-size.html": [ - "fea8f8205053e933de3dc4490c918c3db69a4a05", + "4f3bdbc5d9e38770050d963c32942a63272f0e67", "testharness" ], "css/css-logical/logicalprops-quirklength.html": [ "3024bbd54e4cbe1ee55e59684188587e2a56fda6", "testharness" ], - "css/css-logical/resources/style-check.js": [ - "f6260209571bdd53be52c698f072c121e3702dd1", - "support" - ], "css/css-masking/OWNERS": [ "388433ab37e52bf8982700fad3ffd34b8ecae122", "support" diff --git a/testing/web-platform/tests/css/css-logical/logicalprops-block-size-vlr.html b/testing/web-platform/tests/css/css-logical/logicalprops-block-size-vlr.html dissimilarity index 61% index 4c8c13e9987f..da02e759d8ed 100644 --- a/testing/web-platform/tests/css/css-logical/logicalprops-block-size-vlr.html +++ b/testing/web-platform/tests/css/css-logical/logicalprops-block-size-vlr.html @@ -1,167 +1,122 @@ - - -CSS Logical Properties: {max-,min-}block-size vertical-lr - - - - - - - - - -
-
-
-
-
-
- -

-

-

-

- -

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - + + +CSS Logical Properties: {max-,min-}block-size vertical-lr + + + + + + + + + +
+ +

Maximum and minimim block sizes in blocks with vertical-lr

+
+

block-size < min-block-size

+
+ +

min-block-size < block-size ≤ max-block-size

+
+ +

block-size > max-block-size

+
+
+ +

Overridance of width and block-size in vertical-lr

+
+

Check that width overrides block-size

+
+ +

Check that block-size overrides width

+
+
+ +

Maximum and minimim block sizes in table cells with vertical-lr

+
+

block-size < min-block-size

+
+
+
+ +

min-block-size < block-size ≤ max-block-size

+
+
+
+ +

block-size > max-block-size

+
+
+
+
+ + diff --git a/testing/web-platform/tests/css/css-logical/logicalprops-block-size.html b/testing/web-platform/tests/css/css-logical/logicalprops-block-size.html dissimilarity index 62% index 66cb318e93d5..8d90c07a9838 100644 --- a/testing/web-platform/tests/css/css-logical/logicalprops-block-size.html +++ b/testing/web-platform/tests/css/css-logical/logicalprops-block-size.html @@ -1,163 +1,123 @@ - - -CSS Logical Properties: {max-,min-}block-size - - - - - - - - - -
-
-
-
-
-
- -

-

-

-

- -

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - + + +CSS Logical Properties: {max-,min-}block-size + + + + + + + + + +
+ +

Maximum and minimim block sizes in blocks

+
+

block-size < min-block-size

+
+ +

min-block-size < block-size ≤ max-block-size

+
+ +

block-size > max-block-size

+
+
+ +

Overridance of height and block-size

+
+

Check that height overrides block-size

+
+ +

Check that block-size overrides height

+
+
+ +

Maximum and minimim block sizes in table cells

+
+

block-size < min-block-size

+
+
+
+ +

min-block-size < block-size ≤ max-block-size

+
+
+
+ +

block-size > max-block-size

+
+
+
+
+ + diff --git a/testing/web-platform/tests/css/css-logical/logicalprops-inline-size-vlr.html b/testing/web-platform/tests/css/css-logical/logicalprops-inline-size-vlr.html dissimilarity index 61% index 09e17009c976..0a53dbbc5cf5 100644 --- a/testing/web-platform/tests/css/css-logical/logicalprops-inline-size-vlr.html +++ b/testing/web-platform/tests/css/css-logical/logicalprops-inline-size-vlr.html @@ -1,167 +1,122 @@ - - -CSS Logical Properties: {max-,min-}inline-size vertical-lr - - - - - - - - - -
-
-
-
-
-
- -

-

-

-

- -

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - + + +CSS Logical Properties: {max-,min-}inline-size vertical-lr + + + + + + + + + +
+ +

Maximum and minimim inline sizes in blocks with vertical-lr

+
+

inline-size < min-inline-size

+
+ +

min-inline-size < inline-size ≤ max-inline-size

+
+ +

inline-size > max-inline-size

+
+
+ +

Overridance of height and inline-size in vertical-lr

+
+

Check that height overrides inline-size

+
+ +

Check that inline-size overrides height

+
+
+ +

Maximum and minimim inline sizes in table cells with vertical-lr

+
+

inline-size < min-inline-size

+
+
+
+ +

min-inline-size < inline-size ≤ max-inline-size

+
+
+
+ +

inline-size > max-inline-size

+
+
+
+
+ + diff --git a/testing/web-platform/tests/css/css-logical/logicalprops-inline-size.html b/testing/web-platform/tests/css/css-logical/logicalprops-inline-size.html dissimilarity index 61% index 32ede09cd6d8..3ec169924afb 100644 --- a/testing/web-platform/tests/css/css-logical/logicalprops-inline-size.html +++ b/testing/web-platform/tests/css/css-logical/logicalprops-inline-size.html @@ -1,163 +1,119 @@ - - -CSS Logical Properties: {max-,min-}inline-size - - - - - - - - - -
-
-
-
-
-
- -

-

-

-

- -

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - + + +CSS Logical Properties: {max-,min-}inline-size + + + + + + + + + +
+ +

Maximum and minimim inline sizes in blocks

+
+

inline-size < min-inline-size

+
+ +

min-inline-size < inline-size ≤ max-inline-size

+
+ +

inline-size > max-inline-size

+
+
+ +

Overridance of width and inline-size

+
+

Check that width overrides inline-size

+
+ +

Check that inline-size overrides width

+
+
+ +

Maximum and minimim inline sizes in table cells

+
+

inline-size < min-inline-size

+
+
+
+ +

min-inline-size < inline-size ≤ max-inline-size

+
+
+
+ +

inline-size > max-inline-size

+
+
+
+
+ + diff --git a/testing/web-platform/tests/css/css-logical/resources/style-check.js b/testing/web-platform/tests/css/css-logical/resources/style-check.js deleted file mode 100644 index cd129fd51b80..000000000000 --- a/testing/web-platform/tests/css/css-logical/resources/style-check.js +++ /dev/null @@ -1,9 +0,0 @@ -"use strict"; -function compareWidthHeight(id1, id2) { - var element1 = document.getElementById(id1); - var style1 = getComputedStyle(element1); - var element2 = document.getElementById(id2); - var style2 = getComputedStyle(element2); - return (style1.width == style2.width) && - (style1.height == style2.height) -} -- 2.11.4.GIT