aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/css-tests/css-variables-1_dev/xhtml1print
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2017-02-06 11:06:12 +0100
committerMs2ger <Ms2ger@gmail.com>2017-02-06 22:38:29 +0100
commit296fa2512ba2fbc8f1d6b7e82e30ad3b5d2a9a20 (patch)
tree95ac50cd05fa8a22d1c0fa12016ee0d2012a165c /tests/wpt/css-tests/css-variables-1_dev/xhtml1print
parentfb4f421c8b9cbf80a86c9c5eb88395d7008b27a1 (diff)
downloadservo-296fa2512ba2fbc8f1d6b7e82e30ad3b5d2a9a20.tar.gz
servo-296fa2512ba2fbc8f1d6b7e82e30ad3b5d2a9a20.zip
Update web-platform-tests and CSS tests.
- Update CSS tests to revision e05bfd5e30ed662c2f8a353577003f8eed230180. - Update web-platform-tests to revision a052787dd5c069a340031011196b73affbd68cd9.
Diffstat (limited to 'tests/wpt/css-tests/css-variables-1_dev/xhtml1print')
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht12
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht20
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-without-whitespace-ref.xht15
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-background-shorthand-001-ref.xht22
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-font-shorthand-001-ref.xht30
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht24
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list3
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/test_variable_legal_values.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/toc.xht4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-without-whitespace.xht53
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-background-shorthand-001.xht44
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-font-shorthand-001.xht69
12 files changed, 291 insertions, 7 deletions
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht
index 762d98a222e..e5934d97d92 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht
@@ -13,7 +13,7 @@
<body>
<h1>CSS Custom Properties Level 1 CR Test Suite</h1>
- <h2>Defining Custom Properties: the --* family of properties (96 tests)</h2>
+ <h2>Defining Custom Properties: the --* family of properties (97 tests)</h2>
<table width="100%">
<col id="test-column"></col>
<col id="refs-column"></col>
@@ -335,7 +335,7 @@
<tr><th colspan="4" scope="rowgroup">
<a href="#s2.1">+</a>
<a href="https://www.w3.org/TR/css-variables-1/#syntax">2.1 Custom Property Value Syntax</a></th></tr>
- <!-- 55 tests -->
+ <!-- 56 tests -->
<tr id="variable-declaration-01-2.1" class="">
<td>
<a href="variable-declaration-01.xht">variable-declaration-01</a></td>
@@ -568,6 +568,14 @@
<td>Test declaring a variable in an external CSS file.
</td>
</tr>
+ <tr id="variable-reference-without-whitespace-2.1" class="">
+ <td>
+ <a href="variable-reference-without-whitespace.xht">variable-reference-without-whitespace</a></td>
+ <td><a href="reference/variable-reference-without-whitespace-ref.xht">=</a> </td>
+ <td></td>
+ <td>Variable reference without whitespace
+ </td>
+ </tr>
<tr id="variable-supports-33-2.1" class="">
<td>
<a href="variable-supports-33.xht">variable-supports-33</a></td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht
index 4dce33d927c..639b2a85fc6 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht
@@ -13,7 +13,7 @@
<body>
<h1>CSS Custom Properties Level 1 CR Test Suite</h1>
- <h2>Using Cascading Variables: the var() notation (79 tests)</h2>
+ <h2>Using Cascading Variables: the var() notation (81 tests)</h2>
<table width="100%">
<col id="test-column"></col>
<col id="refs-column"></col>
@@ -678,7 +678,7 @@
<tr><th colspan="4" scope="rowgroup">
<a href="#s3.2">+</a>
<a href="https://www.w3.org/TR/css-variables-1/#variables-in-shorthands">3.2 Variables in Shorthand Properties</a></th></tr>
- <!-- 3 tests -->
+ <!-- 5 tests -->
<tr id="variable-reference-36-3.2" class="">
<td>
<a href="variable-reference-36.xht">variable-reference-36</a></td>
@@ -703,6 +703,22 @@
<td>Test using variables in overlapping shorthands.
</td>
</tr>
+ <tr id="vars-background-shorthand-001-3.2" class="primary">
+ <td><strong>
+ <a href="vars-background-shorthand-001.xht">vars-background-shorthand-001</a></strong></td>
+ <td><a href="reference/vars-background-shorthand-001-ref.xht">=</a> </td>
+ <td></td>
+ <td>CSS Variables 1: Test variables in background shorthand.
+ </td>
+ </tr>
+ <tr id="vars-font-shorthand-001-3.2" class="primary ahem">
+ <td><strong>
+ <a href="vars-font-shorthand-001.xht">vars-font-shorthand-001</a></strong></td>
+ <td><a href="reference/vars-font-shorthand-001-ref.xht">=</a> </td>
+ <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+ <td>CSS Variables 1: Test variables in @font-face, font-family, font shorthand.
+ </td>
+ </tr>
</tbody>
<tbody id="s3.2.#pending-substitution-value">
<!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-without-whitespace-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-without-whitespace-ref.xht
new file mode 100644
index 00000000000..7baee19a429
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-without-whitespace-ref.xht
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>Variable reference without whitespace - reference</title>
+<link href="http://exyr.org/about/" rel="author" title="Simon Sapin" />
+</head><body><p>The next four lines must be identical, containing only zeroes:
+</p><p>0 0 0
+</p><p>0 0 0
+</p><p>0 0 0
+</p><p>0 0 0
+
+</p><p>The next four lines must be identical, containing increasing integers:
+</p><p>1 2 3
+</p><p>1 2 3
+</p><p>1 2 3
+</p><p>1 2 3
+</p></body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-background-shorthand-001-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-background-shorthand-001-ref.xht
new file mode 100644
index 00000000000..2602ee11ffa
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-background-shorthand-001-ref.xht
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Variables 1: Test variables in background shorthand.</title>
+<link href="mailto:lea@verou.me" rel="author" title="Lea Verou" />
+<style>
+div {
+ width: 50px;
+ height: 50px;
+ padding: 50px;
+ margin: 10px;
+ display: inline-block;
+ background: green;
+}
+</style>
+</head><body><p>Test passes if you see four green squares, and no red.</p>
+<div id="d1"></div>
+<div id="d2"></div>
+<div id="d3"></div>
+<div id="d4"></div>
+
+
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-font-shorthand-001-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-font-shorthand-001-ref.xht
new file mode 100644
index 00000000000..ebba5f572f5
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/vars-font-shorthand-001-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Variables 1: Test variables in @font-face, font-family, font shorthand.</title>
+<link href="mailto:lea@verou.me" rel="author" title="Lea Verou" />
+<style>
+
+
+
+div {
+ width: 150px;
+ height: 150px;
+ margin: 10px;
+ display: inline-block;
+ vertical-align: middle;
+ background: green;
+ text-align: center;
+ color: green;
+ overflow: hidden;
+}
+
+</style>
+</head><body><p>Test passes if you see six green squares, and no red.</p>
+<div id="d1">X</div>
+<div id="d2">X</div>
+<div id="d3">X</div>
+<div id="d4">X</div>
+<div id="d5">X</div>
+<div id="d6">X</div>
+
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht
index ccc59a2528d..e1a9891e02f 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht
@@ -880,6 +880,14 @@
<td rowspan="1"></td>
</tr>
</tbody>
+ <tbody id="variable-reference-without-whitespace" class="">
+ <tr>
+ <td rowspan="1" title="Variable reference without whitespace">
+ <a href="variable-reference-without-whitespace.xht">variable-reference-without-whitespace</a></td>
+ <td><a href="reference/variable-reference-without-whitespace-ref.xht">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
<tbody id="variable-supports-01" class="">
<tr>
<td rowspan="1" title="Test a passing non-custom property declaration in an @supports rule where the property value contains a variable reference and no white space tokens.">
@@ -1416,6 +1424,22 @@
<td rowspan="1"></td>
</tr>
</tbody>
+ <tbody id="vars-background-shorthand-001" class="">
+ <tr>
+ <td rowspan="1" title="CSS Variables 1: Test variables in background shorthand.">
+ <a href="vars-background-shorthand-001.xht">vars-background-shorthand-001</a></td>
+ <td><a href="reference/vars-background-shorthand-001-ref.xht">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
+ <tbody id="vars-font-shorthand-001" class="ahem">
+ <tr>
+ <td rowspan="1" title="CSS Variables 1: Test variables in @font-face, font-family, font shorthand.">
+ <a href="vars-font-shorthand-001.xht">vars-font-shorthand-001</a></td>
+ <td><a href="reference/vars-font-shorthand-001-ref.xht">=</a> </td>
+ <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+ </tr>
+ </tbody>
</table>
</body>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list
index cf111f0dab3..113d163a73a 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list
@@ -106,6 +106,7 @@ variable-reference-37.xht == reference/variable-reference-37-ref.xht
variable-reference-38.xht == reference/variable-reference-38-ref.xht
variable-reference-39.xht == support/color-green-ref.xht
variable-reference-40.xht == reference/variable-reference-40-ref.xht
+variable-reference-without-whitespace.xht == reference/variable-reference-without-whitespace-ref.xht
variable-supports-01.xht == support/color-green-ref.xht
variable-supports-02.xht == support/color-green-ref.xht
variable-supports-03.xht == support/color-green-ref.xht
@@ -173,3 +174,5 @@ variable-supports-64.xht == support/color-green-ref.xht
variable-supports-65.xht == support/color-green-ref.xht
variable-supports-66.xht == support/color-green-ref.xht
variable-supports-67.xht == support/color-green-ref.xht
+vars-background-shorthand-001.xht == reference/vars-background-shorthand-001-ref.xht
+vars-font-shorthand-001.xht == reference/vars-font-shorthand-001-ref.xht
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/test_variable_legal_values.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/test_variable_legal_values.xht
index 03b0a669279..13aa4d72942 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/test_variable_legal_values.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/test_variable_legal_values.xht
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<title>CSS Variables Allowed Syntax</title>
- <link href="http://dbaron.org/" rel="author" title="L. David Baron" />
+ <link href="https://dbaron.org/" rel="author" title="L. David Baron" />
<link href="http://mozilla.com/" rel="author" title="Mozilla Corporation" />
<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help" />
<meta content='The &lt;value> type used in the syntax above is defined as anything matching the "value" production in CSS 2.1 Chapter 4.1 [CSS21].' name="assert" />
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/toc.xht
index 0b277d7eaf7..15ff75f9125 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/toc.xht
@@ -27,12 +27,12 @@
<tbody id="s2">
<tr><th><a href="chapter-2.xht">Chapter 2 -
Defining Custom Properties: the --* family of properties</a></th>
- <td>(96 Tests)</td></tr>
+ <td>(97 Tests)</td></tr>
</tbody>
<tbody id="s3">
<tr><th><a href="chapter-3.xht">Chapter 3 -
Using Cascading Variables: the var() notation</a></th>
- <td>(79 Tests)</td></tr>
+ <td>(81 Tests)</td></tr>
</tbody>
<tbody id="s4">
<tr><th><a href="chapter-4.xht">Chapter 4 -
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-without-whitespace.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-without-whitespace.xht
new file mode 100644
index 00000000000..019b3c0a935
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-without-whitespace.xht
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>Variable reference without whitespace</title>
+<link href="reference/variable-reference-without-whitespace-ref.xht" rel="match" />
+<link href="http://www.w3.org/TR/css-variables-1/#syntax" rel="help" />
+<link href="http://exyr.org/about/" rel="author" title="Simon Sapin" />
+<meta content="
+ A variable reference followed by something without whitespace in between
+ must not be interpreted together as a single identifier.
+ Custom property values are sequences of tokens, not strings." rel="assert" />
+<style>
+p {
+ counter-reset: -- --a -a;
+ --dash:-;
+}
+
+#test_1 span::before {
+ counter-increment: var(--dash)-;
+ content: counter(--);
+}
+#test_2 span::before {
+ counter-increment: var(--dash)-a;
+ content: counter(--a);
+}
+#test_3 span::before {
+ counter-increment: var(--dash)a;
+ content: counter(-a);
+}
+
+#control_1 span::before {
+ counter-increment: --;
+ content: counter(--);
+}
+#control_2 span::before {
+ counter-increment: --a;
+ content: counter(--a);
+}
+#control_3 span::before {
+ counter-increment: -a;
+ content: counter(-a);
+}
+</style>
+</head><body><p>The next four lines must be identical, containing only zeroes:
+</p><p id="test_1"><span></span> <span></span> <span></span>
+</p><p id="test_2"><span></span> <span></span> <span></span>
+</p><p id="test_3"><span></span> <span></span> <span></span>
+</p><p>0 0 0
+
+</p><p>The next four lines must be identical, containing increasing integers:
+</p><p id="control_1"><span></span> <span></span> <span></span>
+</p><p id="control_2"><span></span> <span></span> <span></span>
+</p><p id="control_3"><span></span> <span></span> <span></span>
+</p><p>1 2 3
+</p></body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-background-shorthand-001.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-background-shorthand-001.xht
new file mode 100644
index 00000000000..755774f91a5
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-background-shorthand-001.xht
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Variables 1: Test variables in background shorthand.</title>
+<link href="mailto:lea@verou.me" rel="author" title="Lea Verou" />
+<link href="https://www.w3.org/TR/css-variables-1/#variables-in-shorthands" rel="help" />
+<link href="reference/vars-background-shorthand-001-ref.xht" rel="match" />
+<style>
+div {
+ width: 50px;
+ height: 50px;
+ padding: 50px;
+ margin: 10px;
+ display: inline-block;
+ background: red;
+}
+
+div#d1 {
+ --foo: green;
+ background: var(--foo);
+}
+
+div#d2 {
+ --foo: green, green;
+ background: linear-gradient(var(--foo));
+}
+
+div#d3 {
+ --foo: linear-gradient(green, green);
+ background: var(--foo);
+}
+
+div#d4 {
+ --foo: center / 0 0;
+ background: green linear-gradient(red, red) var(--foo, );
+}
+</style>
+</head><body><p>Test passes if you see four green squares, and no red.</p>
+<div id="d1"></div>
+<div id="d2"></div>
+<div id="d3"></div>
+<div id="d4"></div>
+
+
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-font-shorthand-001.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-font-shorthand-001.xht
new file mode 100644
index 00000000000..e77a1695880
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/vars-font-shorthand-001.xht
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Variables 1: Test variables in @font-face, font-family, font shorthand.</title>
+<link href="mailto:lea@verou.me" rel="author" title="Lea Verou" />
+<link href="https://www.w3.org/TR/css-variables-1/#variables-in-shorthands" rel="help" />
+<link href="reference/vars-font-shorthand-001-ref.xht" rel="match" />
+<meta content="ahem" name="flags" />
+<style>
+
+@font-face {
+ font-family: Ahem;
+ src: url(https://cdn.rawgit.com/w3c/csswg-test/master/fonts/ahem/ahem.ttf);
+}
+
+div {
+ width: 150px;
+ height: 150px;
+ margin: 10px;
+ display: inline-block;
+ vertical-align: middle;
+ background: red;
+ text-align: center;
+ color: green;
+ overflow: hidden;
+}
+
+div#d1 {
+ --foo: Ahem;
+ font-family: var(--foo);
+ font-size: 150px;
+ line-height: 1;
+}
+
+div#d2 {
+ --foo: 0 Ahem;
+ font: var(--foo);
+ font-size: 150px;
+ line-height: 150px;
+}
+
+div#d3 {
+ --foo: Ahem, sans-serif;
+ font: 150px/1 var(--foo);
+}
+
+div#d4 {
+ --foo: Ahem;
+ font: 150px/1 var(--foo), sans-serif;
+}
+
+div#d5 {
+ --foo: 1 Ahem;
+ font: 150px/var(--foo);
+}
+
+div#d6 {
+ --foo: 150px/1 Ahem;
+ font: var(--foo);
+}
+</style>
+</head><body><p>Test passes if you see six green squares, and no red.</p>
+<div id="d1">X</div>
+<div id="d2">X</div>
+<div id="d3">X</div>
+<div id="d4">X</div>
+<div id="d5">X</div>
+<div id="d6">X</div>
+
+
+</body></html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 01:24:08 +0000