Update CSS tests to revision 09d27d61d637da536af1d86a8d7bea157592ff9e

author: Simon Sapin <simon.sapin@exyr.org> 2015-09-08 11:01:17 +0200
committer: Simon Sapin <simon.sapin@exyr.org> 2015-09-08 11:01:17 +0200
commit: 5abfa12a4c8f899f7a6a92deb3293507aeb23705 (patch)
tree: 34139730db00a41ceda70cee826349ecec421a6b /tests/wpt/css-tests/css-variables-1_dev
parent: 282f9ade931342e9cd1ae72fde9dd9f88cb5b34a (diff)
download: servo-5abfa12a4c8f899f7a6a92deb3293507aeb23705.tar.gz
servo-5abfa12a4c8f899f7a6a92deb3293507aeb23705.zip
44 files changed, 160 insertions, 184 deletions
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm b/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm
index 363895a4d98..7c4f25d67fd 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm
@@ -37,9 +37,9 @@
             <a href="css-vars-custom-property-case-sensitive-001.htm">css-vars-custom-property-case-sensitive-001</a></strong></td>
         <td><a href="reference/css-vars-custom-property-case-sensitive-ref.htm">=</a> </td>
         <td></td>
-        <td>custom property names start with &quot;var-&quot; in lower case
+        <td>custom property names are case-sensitive
           <ul class="assert">
-            <li>Custom property names start with var- which must be lower case</li>
+            <li>Custom property names are case-sensitive</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-case-sensitive-001.htm b/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-case-sensitive-001.htm
index dabf89970b7..576e7b5b34f 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-case-sensitive-001.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-case-sensitive-001.htm
@@ -1,26 +1,27 @@
 <!DOCTYPE html>
 <html><head>
-    <title>CSS Variables Test: custom property names start with "var-" in lower case</title>
+    <title>CSS Variables Test: custom property names are case-sensitive</title>
     <meta charset="UTF-8">
     <link href="mailto:noahcollins@gmail.com" rel="author" title="Noah Collins">
     <link href="http://www.w3.org/TR/css-variables-1/#using-variables" rel="help">
-    <meta content="Custom property names start with var- which must be lower case" name="assert">
+    <meta content="Custom property names are case-sensitive" name="assert">
     <link href="reference/css-vars-custom-property-case-sensitive-ref.htm" rel="match">
     <style type="text/css">
         :root {
-            /* these should be VALID custom property names */
-            var-veryblue:   #22e;
-            var-AlsoBlue:   #22e;
+            --veryblue:   #22e;
+            --AlsoBlue:   #22e;
 
-            /* these should be INVALID custom property names */
-            VAR-veryred:   #f00;
-            Var-AlsoRed:   #f00;
+            --veryred:   #f00;
+            --AlsoRed:   #f00;
         }
 
-        .blue-good-1  { color: var(veryblue); }
-        .blue-good-2  { color: var(AlsoBlue); }
-        .red-bad-1    { color: var(veryred);  }
-        .red-bad-2    { color: var(AlsoRed);  }
+        /* These match the case of the declarations */
+        .blue-good-1  { color: var(--veryblue); }
+        .blue-good-2  { color: var(--AlsoBlue); }
+
+        /* These DO NOT match the case of the declarations */
+        .red-bad-1    { color: var(--VeryRed);  }
+        .red-bad-2    { color: var(--alsored);  }
     </style>
 </head>
 <body>
@@ -32,4 +33,5 @@
     <p class="red-bad-1">This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
     <p class="red-bad-2">This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-inheritance.htm b/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-inheritance.htm
index 4f06ee3507a..5825b728de5 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-inheritance.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/css-vars-custom-property-inheritance.htm
@@ -9,14 +9,14 @@
     <style type="text/css">
 
         /* test cascade importance */
-        :root { var-color: #1c1 !important; }
-        :root { var-color: red; }
+        :root { --color: #1c1 !important; }
+        :root { --color: red; }
 
         /* test cascade order */
         * { color: red; }
 
         /* test cascade order */
-        * { color: var(color); }
+        * { color: var(--color); }
 
     </style>
 </head>
@@ -26,4 +26,5 @@
     <p>Green</p>
     <p>The test passes if everything is green. Any red means the test failed.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reference/css-vars-custom-property-case-sensitive-ref.htm b/tests/wpt/css-tests/css-variables-1_dev/html/reference/css-vars-custom-property-case-sensitive-ref.htm
index 3ed25b7d62f..be9c2465bac 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/reference/css-vars-custom-property-case-sensitive-ref.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reference/css-vars-custom-property-case-sensitive-ref.htm
@@ -1,23 +1,11 @@
 <!DOCTYPE html>
 <html><head>
-    <title>CSS Variables Test: custom property names start with "var-" in lower case</title>
+    <title>CSS Variables Test: custom property names are case-sensitive</title>
     <meta charset="UTF-8">
     <link href="mailto:noahcollins@gmail.com" rel="author" title="Noah Collins">
     <style type="text/css">
-        :root {
-            /* these should be VALID custom property names */
-            var-veryblue:   #22e;
-            var-AlsoBlue:   #22e;
-
-            /* these should be INVALID custom property names */
-            VAR-veryred:   #f00;
-            Var-AlsoRed:   #f00;
-        }
-
-        .blue-good-1  { color: var(veryblue); }
-        .blue-good-2  { color: var(AlsoBlue); }
-        .red-bad-1    { color: var(veryred);  }
-        .red-bad-2    { color: var(AlsoRed);  }
+        .blue-good-1  { color: #22e; }
+        .blue-good-2  { color: #22e; }
     </style>
 </head>
 <body>
@@ -29,4 +17,5 @@
     <p>This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
     <p>This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/Ahem.ttf b/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/Ahem.ttf
new file mode 100644
index 00000000000..ac81cb03165
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/Ahem.ttf
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/ahem.css b/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/ahem.css
index 0d4bcedc21b..82ee466791e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/ahem.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/ahem.css
@@ -1,4 +1,4 @@
 @font-face {
   font-family: "Ahem";
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/external-variable-font-face.css b/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/external-variable-font-face.css
index 38c86f0cca7..d9873734812 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/external-variable-font-face.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reference/support/external-variable-font-face.css
@@ -1,11 +1,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm
index ceff5a71b9e..7d50d8e0573 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm
@@ -26,7 +26,7 @@
     </thead>
     <tbody id="css-vars-custom-property-case-sensitive-001" class="">
       <tr>
-        <td rowspan="1" title="custom property names start with &quot;var-&quot; in lower case">
+        <td rowspan="1" title="custom property names are case-sensitive">
           <a href="css-vars-custom-property-case-sensitive-001.htm">css-vars-custom-property-case-sensitive-001</a></td>
         <td><a href="reference/css-vars-custom-property-case-sensitive-ref.htm">=</a> </td>
         <td rowspan="1"></td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/support/Ahem.ttf b/tests/wpt/css-tests/css-variables-1_dev/html/support/Ahem.ttf
new file mode 100644
index 00000000000..ac81cb03165
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/support/Ahem.ttf
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/support/ahem.css b/tests/wpt/css-tests/css-variables-1_dev/html/support/ahem.css
index 0d4bcedc21b..82ee466791e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/support/ahem.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/support/ahem.css
@@ -1,4 +1,4 @@
 @font-face {
   font-family: "Ahem";
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/support/external-variable-font-face.css b/tests/wpt/css-tests/css-variables-1_dev/html/support/external-variable-font-face.css
index 38c86f0cca7..d9873734812 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/support/external-variable-font-face.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/support/external-variable-font-face.css
@@ -1,11 +1,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/test_variable_legal_values.htm b/tests/wpt/css-tests/css-variables-1_dev/html/test_variable_legal_values.htm
index 4fb2d5dac28..965fa5e957a 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/test_variable_legal_values.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/test_variable_legal_values.htm
@@ -62,13 +62,13 @@ function run() {
   function assert_allowed_variable_value(value, description) {
     test(function() {
            styleText.data = "#test { \n" +
-                            "  var-test: red;\n" +
-                            "  var-test: " + value + ";\n" +
+                            "  --test: red;\n" +
+                            "  --test: " + value + ";\n" +
                             "  background-color: red;\n" +
-                            "  background-color: var(test);\n" +
+                            "  background-color: var(--test);\n" +
                             "}";
-           assert_true(initial_cs != red_cs &&
-                       initial_cs == test_cs.backgroundColor);
+           assert_not_equals(initial_cs, red_cs);
+           assert_equals(initial_cs, test_cs.backgroundColor);
          },
          description_to_name(description),
          { assert: "Value allowed within variable: " + description });
@@ -77,13 +77,13 @@ function run() {
   function assert_disallowed_balanced_variable_value(value, description) {
     test(function() {
            styleText.data = "#test { \n" +
-                            "  var-test: green;\n" +
-                            "  var-test: " + value + ";\n" +
+                            "  --test: green;\n" +
+                            "  --test: " + value + ";\n" +
                             "  background-color: red;\n" +
-                            "  background-color: var(test);\n" +
+                            "  background-color: var(--test);\n" +
                             "}";
-           assert_true(green_cs != red_cs &&
-                       green_cs == test_cs.backgroundColor);
+           assert_not_equals(green_cs, red_cs);
+           assert_equals(green_cs, test_cs.backgroundColor);
          },
          description_to_name(description),
          { assert: "Value not allowed within variable: " + description });
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-01.htm b/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-01.htm
index a3751708fd2..0936c0071cf 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-01.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-01.htm
@@ -11,11 +11,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-02.htm b/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-02.htm
index 12194759c1b..f738b3a92b1 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-02.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/variable-font-face-02.htm
@@ -13,11 +13,11 @@
 }
 @font-face {
   font-family: var(--a);
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data
index 4dbcc8bb35d..206015f32d6 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data
@@ -3,12 +3,12 @@
 # http://test.csswg.org/suites/css-variables-1_dev/DATESTAMP/
 # See http://wiki.csswg.org/test/implementation-report for instructions
 testname	revision	result	comment
-html/css-vars-custom-property-case-sensitive-001.htm	54635d9858bba609cf606b0a3987e6911732dbfe	?
-xhtml1/css-vars-custom-property-case-sensitive-001.xht	54635d9858bba609cf606b0a3987e6911732dbfe	?
-html/css-vars-custom-property-inheritance.htm	03059d06522d5796fd67aeb24828bfecf6b7120c	?
-xhtml1/css-vars-custom-property-inheritance.xht	03059d06522d5796fd67aeb24828bfecf6b7120c	?
-html/test_variable_legal_values.htm	b7b2d045a2b48fc36715a50ba885f7c0350e6de1	?
-xhtml1/test_variable_legal_values.xht	b7b2d045a2b48fc36715a50ba885f7c0350e6de1	?
+html/css-vars-custom-property-case-sensitive-001.htm	6621d4c36be7454a8997bbf8159288825000133e	?
+xhtml1/css-vars-custom-property-case-sensitive-001.xht	6621d4c36be7454a8997bbf8159288825000133e	?
+html/css-vars-custom-property-inheritance.htm	81714590ccc94dddb3216fd5223891ccc9ad4b6c	?
+xhtml1/css-vars-custom-property-inheritance.xht	81714590ccc94dddb3216fd5223891ccc9ad4b6c	?
+html/test_variable_legal_values.htm	019cbba84cf2951566a7d363f4ddc78b6b6f8c65	?
+xhtml1/test_variable_legal_values.xht	019cbba84cf2951566a7d363f4ddc78b6b6f8c65	?
 html/variable-declaration-01.htm	0d1c6d96e6f0c7dc9082c8d616b52a74a92c5bac	?
 xhtml1/variable-declaration-01.xht	0d1c6d96e6f0c7dc9082c8d616b52a74a92c5bac	?
 html/variable-declaration-02.htm	c6d3c7d84d4ea1c2322da25c5b67babc33c90506	?
@@ -135,10 +135,10 @@ html/variable-external-reference-01.htm	e1cb9adcf7f262364ebec3c2491b07c6c756f91f
 xhtml1/variable-external-reference-01.xht	e1cb9adcf7f262364ebec3c2491b07c6c756f91f	?
 html/variable-external-supports-01.htm	4a4be82f521b45c6bd4e240ecefcc623e603e249	?
 xhtml1/variable-external-supports-01.xht	4a4be82f521b45c6bd4e240ecefcc623e603e249	?
-html/variable-font-face-01.htm	aa02741631a4e3c9e61b631452f6bcb375dd53e4	?
-xhtml1/variable-font-face-01.xht	aa02741631a4e3c9e61b631452f6bcb375dd53e4	?
-html/variable-font-face-02.htm	0092032263c837c21790672575f64faffa052337	?
-xhtml1/variable-font-face-02.xht	0092032263c837c21790672575f64faffa052337	?
+html/variable-font-face-01.htm	7f048ccc17c57ba2430f6764da20f8506dc0bbe5	?
+xhtml1/variable-font-face-01.xht	7f048ccc17c57ba2430f6764da20f8506dc0bbe5	?
+html/variable-font-face-02.htm	ce6bb2785857dc65f7eb6ebcbd619d479392d2c9	?
+xhtml1/variable-font-face-02.xht	ce6bb2785857dc65f7eb6ebcbd619d479392d2c9	?
 html/variable-reference-01.htm	62cc62e31297c7d0cab490882cf143156eac766d	?
 xhtml1/variable-reference-01.xht	62cc62e31297c7d0cab490882cf143156eac766d	?
 html/variable-reference-02.htm	36a8e6041ed4c93b4e50ba8b88f72a6cee7b5d04	?
diff --git a/tests/wpt/css-tests/css-variables-1_dev/testinfo.data b/tests/wpt/css-tests/css-variables-1_dev/testinfo.data
index 9d8583dc023..92b8687306f 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-variables-1_dev/testinfo.data
@@ -1,7 +1,7 @@
 id	references	title	flags	links	revision	credits	assertion
-css-vars-custom-property-case-sensitive-001	reference/css-vars-custom-property-case-sensitive-ref	custom property names start with "var-" in lower case		http://www.w3.org/TR/css-variables-1/#using-variables	54635d9858bba609cf606b0a3987e6911732dbfe	`Noah Collins`<mailto:noahcollins@gmail.com>	Custom property names start with var- which must be lower case
-css-vars-custom-property-inheritance	reference/css-vars-custom-property-inheritance-ref	custom properties use normal inheritance and cascade rules		http://www.w3.org/TR/css-variables-1/#using-variables	03059d06522d5796fd67aeb24828bfecf6b7120c	`Noah Collins`<mailto:noahcollins@gmail.com>	custom properties are resolved with the normal inheritance and cascade rules
-test_variable_legal_values		CSS Variables Allowed Syntax	script	http://www.w3.org/TR/css-variables-1/#defining-variables	b7b2d045a2b48fc36715a50ba885f7c0350e6de1	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	The <value> type used in the syntax above is defined as anything matching the "value" production in CSS 2.1 Chapter 4.1 [CSS21].
+css-vars-custom-property-case-sensitive-001	reference/css-vars-custom-property-case-sensitive-ref	custom property names are case-sensitive		http://www.w3.org/TR/css-variables-1/#using-variables	6621d4c36be7454a8997bbf8159288825000133e	`Noah Collins`<mailto:noahcollins@gmail.com>	Custom property names are case-sensitive
+css-vars-custom-property-inheritance	reference/css-vars-custom-property-inheritance-ref	custom properties use normal inheritance and cascade rules		http://www.w3.org/TR/css-variables-1/#using-variables	81714590ccc94dddb3216fd5223891ccc9ad4b6c	`Noah Collins`<mailto:noahcollins@gmail.com>	custom properties are resolved with the normal inheritance and cascade rules
+test_variable_legal_values		CSS Variables Allowed Syntax	script	http://www.w3.org/TR/css-variables-1/#defining-variables	019cbba84cf2951566a7d363f4ddc78b6b6f8c65	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	The <value> type used in the syntax above is defined as anything matching the "value" production in CSS 2.1 Chapter 4.1 [CSS21].
 variable-declaration-01	support/color-green-ref	Test declaring a variable consisting of a single token preceded by white space.		http://www.w3.org/TR/css-variables-1/#syntax	0d1c6d96e6f0c7dc9082c8d616b52a74a92c5bac	`Cameron McCormack`<mailto:cam@mcc.id.au>	
 variable-declaration-02	support/color-green-ref	Test declaring a variable consisting of a single token with no preceding white space.		http://www.w3.org/TR/css-variables-1/#syntax	c6d3c7d84d4ea1c2322da25c5b67babc33c90506	`Cameron McCormack`<mailto:cam@mcc.id.au>	
 variable-declaration-03	support/color-green-ref	Test declaring a variable that references another variable.		http://www.w3.org/TR/css-variables-1/#syntax	37c4b2cf1249e34ce61286f453d19be7bea68358	`Cameron McCormack`<mailto:cam@mcc.id.au>	
@@ -65,8 +65,8 @@ variable-external-declaration-01	support/color-green-ref	Test declaring a variab
 variable-external-font-face-01	reference/variable-external-font-face-01-ref	Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.	ahem	http://www.w3.org/TR/css-variables-1/#defining-variables	cd1c9a3316640edbbc8a10d235103ef5fb333f08	`Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>	
 variable-external-reference-01	support/color-green-ref	Test the use of a variable in a non-custom property where the variable value is inherited within an external CSS.		http://www.w3.org/TR/css-variables-1/#using-variables	e1cb9adcf7f262364ebec3c2491b07c6c756f91f	`Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>	
 variable-external-supports-01	support/color-green-ref	Test a passing non-custom property declaration in an @supports rule where the property value contains a variable reference within an external stylesheet file.		http://www.w3.org/TR/css-variables-1/#using-variables	4a4be82f521b45c6bd4e240ecefcc623e603e249	`Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>	
-variable-font-face-01	reference/variable-font-face-01-ref	Test the invalid declaration and use of a variable in an @font-face rule.	ahem	http://www.w3.org/TR/css-variables-1/#defining-variables	aa02741631a4e3c9e61b631452f6bcb375dd53e4	`Cameron McCormack`<mailto:cam@mcc.id.au>	
-variable-font-face-02	reference/variable-font-face-02-ref	Test the invalid use of a variable in an @font-face rule where the variable is defined on the root element.	ahem	http://www.w3.org/TR/css-variables-1/#defining-variables	0092032263c837c21790672575f64faffa052337	`Cameron McCormack`<mailto:cam@mcc.id.au>	
+variable-font-face-01	reference/variable-font-face-01-ref	Test the invalid declaration and use of a variable in an @font-face rule.	ahem	http://www.w3.org/TR/css-variables-1/#defining-variables	7f048ccc17c57ba2430f6764da20f8506dc0bbe5	`Cameron McCormack`<mailto:cam@mcc.id.au>	
+variable-font-face-02	reference/variable-font-face-02-ref	Test the invalid use of a variable in an @font-face rule where the variable is defined on the root element.	ahem	http://www.w3.org/TR/css-variables-1/#defining-variables	ce6bb2785857dc65f7eb6ebcbd619d479392d2c9	`Cameron McCormack`<mailto:cam@mcc.id.au>	
 variable-reference-01	support/color-green-ref	Test the use of a variable in a non-custom property where the variable value is inherited.		http://www.w3.org/TR/css-variables-1/#using-variables	62cc62e31297c7d0cab490882cf143156eac766d	`Cameron McCormack`<mailto:cam@mcc.id.au>	
 variable-reference-02	support/color-green-ref	Test the use of a variable in a non-custom property where the value is invalid at computed-value time due to referencing a non-existent variable.		http://www.w3.org/TR/css-variables-1/#invalid-variables	36a8e6041ed4c93b4e50ba8b88f72a6cee7b5d04	`Cameron McCormack`<mailto:cam@mcc.id.au>	
 variable-reference-03	support/color-green-ref	Test the use of two variables in a non-custom property where the variable values are inherited and one of the variable values consists only of white space.		http://www.w3.org/TR/css-variables-1/#using-variables	6664ae6697e79d276fe5ac5696b4665ed481df15	`Cameron McCormack`<mailto:cam@mcc.id.au>	
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht
index 429a7818dcd..9bab435bdd0 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht
@@ -37,9 +37,9 @@
             <a href="css-vars-custom-property-case-sensitive-001.xht">css-vars-custom-property-case-sensitive-001</a></strong></td>
         <td><a href="reference/css-vars-custom-property-case-sensitive-ref.xht">=</a> </td>
         <td></td>
-        <td>custom property names start with &quot;var-&quot; in lower case
+        <td>custom property names are case-sensitive
           <ul class="assert">
-            <li>Custom property names start with var- which must be lower case</li>
+            <li>Custom property names are case-sensitive</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-case-sensitive-001.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-case-sensitive-001.xht
index 809531004fe..dd06c41a7ea 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-case-sensitive-001.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-case-sensitive-001.xht
@@ -1,26 +1,27 @@
 <!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 Test: custom property names start with "var-" in lower case</title>
+    <title>CSS Variables Test: custom property names are case-sensitive</title>
     <meta charset="UTF-8" />
     <link href="mailto:noahcollins@gmail.com" rel="author" title="Noah Collins" />
     <link href="http://www.w3.org/TR/css-variables-1/#using-variables" rel="help" />
-    <meta content="Custom property names start with var- which must be lower case" name="assert" />
+    <meta content="Custom property names are case-sensitive" name="assert" />
     <link href="reference/css-vars-custom-property-case-sensitive-ref.xht" rel="match" />
     <style type="text/css">
         :root {
-            /* these should be VALID custom property names */
-            var-veryblue:   #22e;
-            var-AlsoBlue:   #22e;
+            --veryblue:   #22e;
+            --AlsoBlue:   #22e;
 
-            /* these should be INVALID custom property names */
-            VAR-veryred:   #f00;
-            Var-AlsoRed:   #f00;
+            --veryred:   #f00;
+            --AlsoRed:   #f00;
         }
 
-        .blue-good-1  { color: var(veryblue); }
-        .blue-good-2  { color: var(AlsoBlue); }
-        .red-bad-1    { color: var(veryred);  }
-        .red-bad-2    { color: var(AlsoRed);  }
+        /* These match the case of the declarations */
+        .blue-good-1  { color: var(--veryblue); }
+        .blue-good-2  { color: var(--AlsoBlue); }
+
+        /* These DO NOT match the case of the declarations */
+        .red-bad-1    { color: var(--VeryRed);  }
+        .red-bad-2    { color: var(--alsored);  }
     </style>
 </head>
 <body>
@@ -32,4 +33,5 @@
     <p class="red-bad-1">This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
     <p class="red-bad-2">This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-inheritance.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-inheritance.xht
index 88a2f98960d..23bc29978e9 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-inheritance.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/css-vars-custom-property-inheritance.xht
@@ -9,14 +9,14 @@
     <style type="text/css">
 
         /* test cascade importance */
-        :root { var-color: #1c1 !important; }
-        :root { var-color: red; }
+        :root { --color: #1c1 !important; }
+        :root { --color: red; }
 
         /* test cascade order */
         * { color: red; }
 
         /* test cascade order */
-        * { color: var(color); }
+        * { color: var(--color); }
 
     </style>
 </head>
@@ -26,4 +26,5 @@
     <p>Green</p>
     <p>The test passes if everything is green. Any red means the test failed.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/css-vars-custom-property-case-sensitive-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/css-vars-custom-property-case-sensitive-ref.xht
index 4eff0b14dd8..7a6536a0cf7 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/css-vars-custom-property-case-sensitive-ref.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/css-vars-custom-property-case-sensitive-ref.xht
@@ -1,23 +1,11 @@
 <!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 Test: custom property names start with "var-" in lower case</title>
+    <title>CSS Variables Test: custom property names are case-sensitive</title>
     <meta charset="UTF-8" />
     <link href="mailto:noahcollins@gmail.com" rel="author" title="Noah Collins" />
     <style type="text/css">
-        :root {
-            /* these should be VALID custom property names */
-            var-veryblue:   #22e;
-            var-AlsoBlue:   #22e;
-
-            /* these should be INVALID custom property names */
-            VAR-veryred:   #f00;
-            Var-AlsoRed:   #f00;
-        }
-
-        .blue-good-1  { color: var(veryblue); }
-        .blue-good-2  { color: var(AlsoBlue); }
-        .red-bad-1    { color: var(veryred);  }
-        .red-bad-2    { color: var(AlsoRed);  }
+        .blue-good-1  { color: #22e; }
+        .blue-good-2  { color: #22e; }
     </style>
 </head>
 <body>
@@ -29,4 +17,5 @@
     <p>This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
     <p>This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/Ahem.ttf b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/Ahem.ttf
new file mode 100644
index 00000000000..ac81cb03165
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/Ahem.ttf
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/ahem.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/ahem.css
index 0d4bcedc21b..82ee466791e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/ahem.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/ahem.css
@@ -1,4 +1,4 @@
 @font-face {
   font-family: "Ahem";
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/external-variable-font-face.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/external-variable-font-face.css
index 38c86f0cca7..d9873734812 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/external-variable-font-face.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/support/external-variable-font-face.css
@@ -1,11 +1,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht
index 8363b3229e0..ccc59a2528d 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht
@@ -26,7 +26,7 @@
     </thead>
     <tbody id="css-vars-custom-property-case-sensitive-001" class="">
       <tr>
-        <td rowspan="1" title="custom property names start with &quot;var-&quot; in lower case">
+        <td rowspan="1" title="custom property names are case-sensitive">
           <a href="css-vars-custom-property-case-sensitive-001.xht">css-vars-custom-property-case-sensitive-001</a></td>
         <td><a href="reference/css-vars-custom-property-case-sensitive-ref.xht">=</a> </td>
         <td rowspan="1"></td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/Ahem.ttf b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/Ahem.ttf
new file mode 100644
index 00000000000..ac81cb03165
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/Ahem.ttf
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/ahem.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/ahem.css
index 0d4bcedc21b..82ee466791e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/ahem.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/ahem.css
@@ -1,4 +1,4 @@
 @font-face {
   font-family: "Ahem";
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/external-variable-font-face.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/external-variable-font-face.css
index 38c86f0cca7..d9873734812 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/external-variable-font-face.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/support/external-variable-font-face.css
@@ -1,11 +1,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/test_variable_legal_values.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/test_variable_legal_values.xht
index 22f6a36dbe1..03b0a669279 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/test_variable_legal_values.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/test_variable_legal_values.xht
@@ -62,13 +62,13 @@ function run() {
   function assert_allowed_variable_value(value, description) {
     test(function() {
            styleText.data = "#test { \n" +
-                            "  var-test: red;\n" +
-                            "  var-test: " + value + ";\n" +
+                            "  --test: red;\n" +
+                            "  --test: " + value + ";\n" +
                             "  background-color: red;\n" +
-                            "  background-color: var(test);\n" +
+                            "  background-color: var(--test);\n" +
                             "}";
-           assert_true(initial_cs != red_cs &amp;&amp;
-                       initial_cs == test_cs.backgroundColor);
+           assert_not_equals(initial_cs, red_cs);
+           assert_equals(initial_cs, test_cs.backgroundColor);
          },
          description_to_name(description),
          { assert: "Value allowed within variable: " + description });
@@ -77,13 +77,13 @@ function run() {
   function assert_disallowed_balanced_variable_value(value, description) {
     test(function() {
            styleText.data = "#test { \n" +
-                            "  var-test: green;\n" +
-                            "  var-test: " + value + ";\n" +
+                            "  --test: green;\n" +
+                            "  --test: " + value + ";\n" +
                             "  background-color: red;\n" +
-                            "  background-color: var(test);\n" +
+                            "  background-color: var(--test);\n" +
                             "}";
-           assert_true(green_cs != red_cs &amp;&amp;
-                       green_cs == test_cs.backgroundColor);
+           assert_not_equals(green_cs, red_cs);
+           assert_equals(green_cs, test_cs.backgroundColor);
          },
          description_to_name(description),
          { assert: "Value not allowed within variable: " + description });
@@ -107,11 +107,11 @@ function run() {
   assert_disallowed_balanced_variable_value("(])", "unbalanced close bracket in something balanced");
   assert_disallowed_balanced_variable_value("[)]", "unbalanced close paren in something balanced");
   assert_disallowed_balanced_variable_value("(})", "unbalanced close brace in something balanced");
-  assert_allowed_variable_value("&amp;lt;!--", "CDO at top level");
-  assert_allowed_variable_value("--&amp;gt;", "CDC at top level");
-  assert_allowed_variable_value("(;)", "semicolon not at top level (value -&amp;gt; unused)");
-  assert_allowed_variable_value("(&amp;lt;!--)", "CDO not at top level (value -&amp;gt; unused)");
-  assert_allowed_variable_value("(--&amp;gt;)", "CDC not at top level (value -&amp;gt; unused)");
+  assert_allowed_variable_value("&lt;!--", "CDO at top level");
+  assert_allowed_variable_value("--&gt;", "CDC at top level");
+  assert_allowed_variable_value("(;)", "semicolon not at top level (value -&gt; unused)");
+  assert_allowed_variable_value("(&lt;!--)", "CDO not at top level (value -&gt; unused)");
+  assert_allowed_variable_value("(--&gt;)", "CDC not at top level (value -&gt; unused)");
 
   done();
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-01.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-01.xht
index 0693864df8b..65bfeda07d0 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-01.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-01.xht
@@ -11,11 +11,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-02.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-02.xht
index 0e3dcee9663..7b52055d3ca 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-02.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-font-face-02.xht
@@ -13,11 +13,11 @@
 }
 @font-face {
   font-family: var(--a);
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
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 429a7818dcd..9bab435bdd0 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
@@ -37,9 +37,9 @@
             <a href="css-vars-custom-property-case-sensitive-001.xht">css-vars-custom-property-case-sensitive-001</a></strong></td>
         <td><a href="reference/css-vars-custom-property-case-sensitive-ref.xht">=</a> </td>
         <td></td>
-        <td>custom property names start with &quot;var-&quot; in lower case
+        <td>custom property names are case-sensitive
           <ul class="assert">
-            <li>Custom property names start with var- which must be lower case</li>
+            <li>Custom property names are case-sensitive</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-case-sensitive-001.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-case-sensitive-001.xht
index 809531004fe..dd06c41a7ea 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-case-sensitive-001.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-case-sensitive-001.xht
@@ -1,26 +1,27 @@
 <!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 Test: custom property names start with "var-" in lower case</title>
+    <title>CSS Variables Test: custom property names are case-sensitive</title>
     <meta charset="UTF-8" />
     <link href="mailto:noahcollins@gmail.com" rel="author" title="Noah Collins" />
     <link href="http://www.w3.org/TR/css-variables-1/#using-variables" rel="help" />
-    <meta content="Custom property names start with var- which must be lower case" name="assert" />
+    <meta content="Custom property names are case-sensitive" name="assert" />
     <link href="reference/css-vars-custom-property-case-sensitive-ref.xht" rel="match" />
     <style type="text/css">
         :root {
-            /* these should be VALID custom property names */
-            var-veryblue:   #22e;
-            var-AlsoBlue:   #22e;
+            --veryblue:   #22e;
+            --AlsoBlue:   #22e;
 
-            /* these should be INVALID custom property names */
-            VAR-veryred:   #f00;
-            Var-AlsoRed:   #f00;
+            --veryred:   #f00;
+            --AlsoRed:   #f00;
         }
 
-        .blue-good-1  { color: var(veryblue); }
-        .blue-good-2  { color: var(AlsoBlue); }
-        .red-bad-1    { color: var(veryred);  }
-        .red-bad-2    { color: var(AlsoRed);  }
+        /* These match the case of the declarations */
+        .blue-good-1  { color: var(--veryblue); }
+        .blue-good-2  { color: var(--AlsoBlue); }
+
+        /* These DO NOT match the case of the declarations */
+        .red-bad-1    { color: var(--VeryRed);  }
+        .red-bad-2    { color: var(--alsored);  }
     </style>
 </head>
 <body>
@@ -32,4 +33,5 @@
     <p class="red-bad-1">This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
     <p class="red-bad-2">This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-inheritance.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-inheritance.xht
index 88a2f98960d..23bc29978e9 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-inheritance.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/css-vars-custom-property-inheritance.xht
@@ -9,14 +9,14 @@
     <style type="text/css">
 
         /* test cascade importance */
-        :root { var-color: #1c1 !important; }
-        :root { var-color: red; }
+        :root { --color: #1c1 !important; }
+        :root { --color: red; }
 
         /* test cascade order */
         * { color: red; }
 
         /* test cascade order */
-        * { color: var(color); }
+        * { color: var(--color); }
 
     </style>
 </head>
@@ -26,4 +26,5 @@
     <p>Green</p>
     <p>The test passes if everything is green. Any red means the test failed.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/css-vars-custom-property-case-sensitive-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/css-vars-custom-property-case-sensitive-ref.xht
index 4eff0b14dd8..7a6536a0cf7 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/css-vars-custom-property-case-sensitive-ref.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/css-vars-custom-property-case-sensitive-ref.xht
@@ -1,23 +1,11 @@
 <!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 Test: custom property names start with "var-" in lower case</title>
+    <title>CSS Variables Test: custom property names are case-sensitive</title>
     <meta charset="UTF-8" />
     <link href="mailto:noahcollins@gmail.com" rel="author" title="Noah Collins" />
     <style type="text/css">
-        :root {
-            /* these should be VALID custom property names */
-            var-veryblue:   #22e;
-            var-AlsoBlue:   #22e;
-
-            /* these should be INVALID custom property names */
-            VAR-veryred:   #f00;
-            Var-AlsoRed:   #f00;
-        }
-
-        .blue-good-1  { color: var(veryblue); }
-        .blue-good-2  { color: var(AlsoBlue); }
-        .red-bad-1    { color: var(veryred);  }
-        .red-bad-2    { color: var(AlsoRed);  }
+        .blue-good-1  { color: #22e; }
+        .blue-good-2  { color: #22e; }
     </style>
 </head>
 <body>
@@ -29,4 +17,5 @@
     <p>This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
     <p>This paragraph is styled using an invalid CSS Variable name. Fail if red.</p>
 
+
 </body></html>
 \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/Ahem.ttf b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/Ahem.ttf
new file mode 100644
index 00000000000..ac81cb03165
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/Ahem.ttf
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/ahem.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/ahem.css
index 0d4bcedc21b..82ee466791e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/ahem.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/ahem.css
@@ -1,4 +1,4 @@
 @font-face {
   font-family: "Ahem";
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/external-variable-font-face.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/external-variable-font-face.css
index 38c86f0cca7..d9873734812 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/external-variable-font-face.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/support/external-variable-font-face.css
@@ -1,11 +1,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
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 8363b3229e0..ccc59a2528d 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
@@ -26,7 +26,7 @@
     </thead>
     <tbody id="css-vars-custom-property-case-sensitive-001" class="">
       <tr>
-        <td rowspan="1" title="custom property names start with &quot;var-&quot; in lower case">
+        <td rowspan="1" title="custom property names are case-sensitive">
           <a href="css-vars-custom-property-case-sensitive-001.xht">css-vars-custom-property-case-sensitive-001</a></td>
         <td><a href="reference/css-vars-custom-property-case-sensitive-ref.xht">=</a> </td>
         <td rowspan="1"></td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/Ahem.ttf b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/Ahem.ttf
new file mode 100644
index 00000000000..ac81cb03165
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/Ahem.ttf
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/ahem.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/ahem.css
index 0d4bcedc21b..82ee466791e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/ahem.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/ahem.css
@@ -1,4 +1,4 @@
 @font-face {
   font-family: "Ahem";
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/external-variable-font-face.css b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/external-variable-font-face.css
index 38c86f0cca7..d9873734812 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/external-variable-font-face.css
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/support/external-variable-font-face.css
@@ -1,11 +1,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../../fonts/Ahem.ttf);
+  src: url(./Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
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 22f6a36dbe1..03b0a669279 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
@@ -62,13 +62,13 @@ function run() {
   function assert_allowed_variable_value(value, description) {
     test(function() {
            styleText.data = "#test { \n" +
-                            "  var-test: red;\n" +
-                            "  var-test: " + value + ";\n" +
+                            "  --test: red;\n" +
+                            "  --test: " + value + ";\n" +
                             "  background-color: red;\n" +
-                            "  background-color: var(test);\n" +
+                            "  background-color: var(--test);\n" +
                             "}";
-           assert_true(initial_cs != red_cs &amp;&amp;
-                       initial_cs == test_cs.backgroundColor);
+           assert_not_equals(initial_cs, red_cs);
+           assert_equals(initial_cs, test_cs.backgroundColor);
          },
          description_to_name(description),
          { assert: "Value allowed within variable: " + description });
@@ -77,13 +77,13 @@ function run() {
   function assert_disallowed_balanced_variable_value(value, description) {
     test(function() {
            styleText.data = "#test { \n" +
-                            "  var-test: green;\n" +
-                            "  var-test: " + value + ";\n" +
+                            "  --test: green;\n" +
+                            "  --test: " + value + ";\n" +
                             "  background-color: red;\n" +
-                            "  background-color: var(test);\n" +
+                            "  background-color: var(--test);\n" +
                             "}";
-           assert_true(green_cs != red_cs &amp;&amp;
-                       green_cs == test_cs.backgroundColor);
+           assert_not_equals(green_cs, red_cs);
+           assert_equals(green_cs, test_cs.backgroundColor);
          },
          description_to_name(description),
          { assert: "Value not allowed within variable: " + description });
@@ -107,11 +107,11 @@ function run() {
   assert_disallowed_balanced_variable_value("(])", "unbalanced close bracket in something balanced");
   assert_disallowed_balanced_variable_value("[)]", "unbalanced close paren in something balanced");
   assert_disallowed_balanced_variable_value("(})", "unbalanced close brace in something balanced");
-  assert_allowed_variable_value("&amp;lt;!--", "CDO at top level");
-  assert_allowed_variable_value("--&amp;gt;", "CDC at top level");
-  assert_allowed_variable_value("(;)", "semicolon not at top level (value -&amp;gt; unused)");
-  assert_allowed_variable_value("(&amp;lt;!--)", "CDO not at top level (value -&amp;gt; unused)");
-  assert_allowed_variable_value("(--&amp;gt;)", "CDC not at top level (value -&amp;gt; unused)");
+  assert_allowed_variable_value("&lt;!--", "CDO at top level");
+  assert_allowed_variable_value("--&gt;", "CDC at top level");
+  assert_allowed_variable_value("(;)", "semicolon not at top level (value -&gt; unused)");
+  assert_allowed_variable_value("(&lt;!--)", "CDO not at top level (value -&gt; unused)");
+  assert_allowed_variable_value("(--&gt;)", "CDC not at top level (value -&gt; unused)");
 
   done();
 }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-01.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-01.xht
index 0693864df8b..65bfeda07d0 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-01.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-01.xht
@@ -11,11 +11,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-02.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-02.xht
index 0e3dcee9663..7b52055d3ca 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-02.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-font-face-02.xht
@@ -13,11 +13,11 @@
 }
 @font-face {
   font-family: var(--a);
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(../../../fonts/Ahem.ttf);
+  src: url(support/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName;
author	Simon Sapin <simon.sapin@exyr.org>	2015-09-08 11:01:17 +0200
committer	Simon Sapin <simon.sapin@exyr.org>	2015-09-08 11:01:17 +0200
commit	5abfa12a4c8f899f7a6a92deb3293507aeb23705 (patch)
tree	34139730db00a41ceda70cee826349ecec421a6b /tests/wpt/css-tests/css-variables-1_dev
parent	282f9ade931342e9cd1ae72fde9dd9f88cb5b34a (diff)
download	servo-5abfa12a4c8f899f7a6a92deb3293507aeb23705.tar.gz servo-5abfa12a4c8f899f7a6a92deb3293507aeb23705.zip