From f22c98610280ce58514ca1dd50a79304d112182d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 15 Jan 2012 19:47:38 +0100
Subject: [PATCH] tests: Update CSS tests for borders

Borders now expect 'px'.
---
 tests/css/parser/border-radius.css            |  48 ++++----
 tests/css/parser/border-radius.ref.css        | 104 +++++++++---------
 tests/css/parser/declarations-valid-16.css    |   2 +-
 .../css/parser/declarations-valid-16.ref.css  |  16 +--
 tests/css/parser/shorthand.css                |   2 +-
 tests/css/parser/shorthand.ref.css            |   8 +-
 6 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/tests/css/parser/border-radius.css b/tests/css/parser/border-radius.css
index 7a3312fcf7..5dd8fb0efe 100644
--- a/tests/css/parser/border-radius.css
+++ b/tests/css/parser/border-radius.css
@@ -1,45 +1,45 @@
 a {
-  border-radius: 1;
+  border-radius: 1px;
 }
 
 b {
-  border-radius: 1 2;
+  border-radius: 1px 2px;
 }
 
 c {
-  border-radius: 1 2 3;
+  border-radius: 1px 2px 3px;
 }
 
 d {
-  border-radius: 1 2 3 4;
+  border-radius: 1px 2px 3px 4px;
 }
 
 e {
-  border-radius: 1 2 3 4 / 5;
+  border-radius: 1px 2px 3px 4px / 5px;
 }
 
 f {
-  border-radius: 1 2 3 4 / 5 6;
+  border-radius: 1px 2px 3px 4px / 5px 6px;
 }
 
 g {
-  border-radius: 1 2 3 4 / 5 6 7;
+  border-radius: 1px 2px 3px 4px / 5px 6px 7px;
 }
 
 h {
-  border-radius: 1 2 3 4 / 5 6 7 8;
+  border-radius: 1px 2px 3px 4px / 5px 6px 7px 8px;
 }
 
 i {
-  border-radius: 1.125 / 5.5;
+  border-radius: 1.125px / 5.5px;
 }
 
 j {
-  border-radius: 1 2.25 / 5;
+  border-radius: 1px 2.25px / 5px;
 }
 
 k {
-  border-radius: 1 2 3.5 / 5.5 6.75;
+  border-radius: 1px 2px 3.5px / 5.5px 6.75px;
 }
 
 l {
@@ -51,45 +51,45 @@ m {
 }
 
 n {
-  border-radius: 0 / 1;
+  border-radius: 0 / 1px;
 }
 
 o {
-  border-radius: 1 / 0;
+  border-radius: 1px / 0;
 }
 
 /* errors go here */
 
 ea {
-  border-radius: -1 1 1 1 / 1 1 1 1;
+  border-radius: -1px 1px 1px 1px / 1px 1px 1px 1px;
 }
 
 eb {
-  border-radius: 1 -1 1 1 / 1 1 1 1;
+  border-radius: 1px -1px 1px 1px / 1px 1px 1px 1px;
 }
 
 ec {
-  border-radius: 1 1 -1 1 / 1 1 1 1;
+  border-radius: 1px 1px -1px 1px / 1px 1px 1px 1px;
 }
 
 ed {
-  border-radius: 1 1 1 -1 / 1 1 1 1;
+  border-radius: 1px 1px 1px -1px / 1px 1px 1px 1px;
 }
 
 ee {
-  border-radius: 1 1 1 1 / -1 1 1 1;
+  border-radius: 1px 1px 1px 1px / -1px 1px 1px 1px;
 }
 
 ef {
-  border-radius: 1 1 1 1 / 1 -1 1 1;
+  border-radius: 1px 1px 1px 1px / 1px -1px 1px 1px;
 }
 
 eg {
-  border-radius: 1 1 1 1 / 1 1 -1 1;
+  border-radius: 1px 1px 1px 1px / 1px 1px -1px 1px;
 }
 
 eh {
-  border-radius: 1 1 1 1 / 1 1 1 -1;
+  border-radius: 1px 1px 1px 1px / 1px 1px 1px -1px;
 }
 
 ei {
@@ -101,13 +101,13 @@ ej {
 }
 
 ek {
-  border-radius: 1 /;
+  border-radius: 1px /;
 }
 
 el {
-  border-radius: 1 2 3 4 5;
+  border-radius: 1px 2px 3px 4px 5px;
 }
 
 em {
-  border-radius: 1 2 / 1 2 3 4 5;
+  border-radius: 1px 2px / 1px 2px 3px 4px 5px;
 }
diff --git a/tests/css/parser/border-radius.ref.css b/tests/css/parser/border-radius.ref.css
index 14f7f0408e..51a211d408 100644
--- a/tests/css/parser/border-radius.ref.css
+++ b/tests/css/parser/border-radius.ref.css
@@ -1,78 +1,78 @@
 a {
-  border-bottom-left-radius: 1;
-  border-bottom-right-radius: 1;
-  border-top-left-radius: 1;
-  border-top-right-radius: 1;
+  border-bottom-left-radius: 1px;
+  border-bottom-right-radius: 1px;
+  border-top-left-radius: 1px;
+  border-top-right-radius: 1px;
 }
 
 b {
-  border-bottom-left-radius: 2;
-  border-bottom-right-radius: 1;
-  border-top-left-radius: 1;
-  border-top-right-radius: 2;
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 1px;
+  border-top-left-radius: 1px;
+  border-top-right-radius: 2px;
 }
 
 c {
-  border-bottom-left-radius: 2;
-  border-bottom-right-radius: 3;
-  border-top-left-radius: 1;
-  border-top-right-radius: 2;
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 3px;
+  border-top-left-radius: 1px;
+  border-top-right-radius: 2px;
 }
 
 d {
-  border-bottom-left-radius: 4;
-  border-bottom-right-radius: 3;
-  border-top-left-radius: 1;
-  border-top-right-radius: 2;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 3px;
+  border-top-left-radius: 1px;
+  border-top-right-radius: 2px;
 }
 
 e {
-  border-bottom-left-radius: 4 5;
-  border-bottom-right-radius: 3 5;
-  border-top-left-radius: 1 5;
-  border-top-right-radius: 2 5;
+  border-bottom-left-radius: 4px 5px;
+  border-bottom-right-radius: 3px 5px;
+  border-top-left-radius: 1px 5px;
+  border-top-right-radius: 2px 5px;
 }
 
 f {
-  border-bottom-left-radius: 4 6;
-  border-bottom-right-radius: 3 5;
-  border-top-left-radius: 1 5;
-  border-top-right-radius: 2 6;
+  border-bottom-left-radius: 4px 6px;
+  border-bottom-right-radius: 3px 5px;
+  border-top-left-radius: 1px 5px;
+  border-top-right-radius: 2px 6px;
 }
 
 g {
-  border-bottom-left-radius: 4 6;
-  border-bottom-right-radius: 3 7;
-  border-top-left-radius: 1 5;
-  border-top-right-radius: 2 6;
+  border-bottom-left-radius: 4px 6px;
+  border-bottom-right-radius: 3px 7px;
+  border-top-left-radius: 1px 5px;
+  border-top-right-radius: 2px 6px;
 }
 
 h {
-  border-bottom-left-radius: 4 8;
-  border-bottom-right-radius: 3 7;
-  border-top-left-radius: 1 5;
-  border-top-right-radius: 2 6;
+  border-bottom-left-radius: 4px 8px;
+  border-bottom-right-radius: 3px 7px;
+  border-top-left-radius: 1px 5px;
+  border-top-right-radius: 2px 6px;
 }
 
 i {
-  border-bottom-left-radius: 1.125 5.5;
-  border-bottom-right-radius: 1.125 5.5;
-  border-top-left-radius: 1.125 5.5;
-  border-top-right-radius: 1.125 5.5;
+  border-bottom-left-radius: 1.125px 5.5px;
+  border-bottom-right-radius: 1.125px 5.5px;
+  border-top-left-radius: 1.125px 5.5px;
+  border-top-right-radius: 1.125px 5.5px;
 }
 
 j {
-  border-bottom-left-radius: 2.25 5;
-  border-bottom-right-radius: 1 5;
-  border-top-left-radius: 1 5;
-  border-top-right-radius: 2.25 5;
+  border-bottom-left-radius: 2.25px 5px;
+  border-bottom-right-radius: 1px 5px;
+  border-top-left-radius: 1px 5px;
+  border-top-right-radius: 2.25px 5px;
 }
 
 k {
-  border-bottom-left-radius: 2 6.75;
-  border-bottom-right-radius: 3.5 5.5;
-  border-top-left-radius: 1 5.5;
-  border-top-right-radius: 2 6.75;
+  border-bottom-left-radius: 2px 6.75px;
+  border-bottom-right-radius: 3.5px 5.5px;
+  border-top-left-radius: 1px 5.5px;
+  border-top-right-radius: 2px 6.75px;
 }
 
 l {
@@ -90,15 +90,15 @@ m {
 }
 
 n {
-  border-bottom-left-radius: 0 1;
-  border-bottom-right-radius: 0 1;
-  border-top-left-radius: 0 1;
-  border-top-right-radius: 0 1;
+  border-bottom-left-radius: 0 1px;
+  border-bottom-right-radius: 0 1px;
+  border-top-left-radius: 0 1px;
+  border-top-right-radius: 0 1px;
 }
 
 o {
-  border-bottom-left-radius: 1 0;
-  border-bottom-right-radius: 1 0;
-  border-top-left-radius: 1 0;
-  border-top-right-radius: 1 0;
+  border-bottom-left-radius: 1px 0;
+  border-bottom-right-radius: 1px 0;
+  border-top-left-radius: 1px 0;
+  border-top-right-radius: 1px 0;
 }
diff --git a/tests/css/parser/declarations-valid-16.css b/tests/css/parser/declarations-valid-16.css
index deff898c6c..fe8a64e819 100644
--- a/tests/css/parser/declarations-valid-16.css
+++ b/tests/css/parser/declarations-valid-16.css
@@ -1 +1 @@
-* { border-width: 5; border-radius: 10 }
+* { border-width: 5em; border-radius: 10ex }
diff --git a/tests/css/parser/declarations-valid-16.ref.css b/tests/css/parser/declarations-valid-16.ref.css
index 215fde7f73..10c32c1d7d 100644
--- a/tests/css/parser/declarations-valid-16.ref.css
+++ b/tests/css/parser/declarations-valid-16.ref.css
@@ -1,10 +1,10 @@
 * {
-  border-bottom-left-radius: 10;
-  border-bottom-right-radius: 10;
-  border-bottom-width: 5;
-  border-left-width: 5;
-  border-right-width: 5;
-  border-top-left-radius: 10;
-  border-top-right-radius: 10;
-  border-top-width: 5;
+  border-bottom-left-radius: 10ex;
+  border-bottom-right-radius: 10ex;
+  border-bottom-width: 5em;
+  border-left-width: 5em;
+  border-right-width: 5em;
+  border-top-left-radius: 10ex;
+  border-top-right-radius: 10ex;
+  border-top-width: 5em;
 }
diff --git a/tests/css/parser/shorthand.css b/tests/css/parser/shorthand.css
index 5a207352f8..a61393a18e 100644
--- a/tests/css/parser/shorthand.css
+++ b/tests/css/parser/shorthand.css
@@ -1,5 +1,5 @@
 /* need to use an existing shorthand, the public API doesn't
  * allow custom ones */
 a {
-  border-width: 1 2 3;
+  border-width: 1pc 2pt 3em;
 }
diff --git a/tests/css/parser/shorthand.ref.css b/tests/css/parser/shorthand.ref.css
index a2f349ba35..e592a7dd00 100644
--- a/tests/css/parser/shorthand.ref.css
+++ b/tests/css/parser/shorthand.ref.css
@@ -1,6 +1,6 @@
 a {
-  border-bottom-width: 3;
-  border-left-width: 2;
-  border-right-width: 2;
-  border-top-width: 1;
+  border-bottom-width: 3em;
+  border-left-width: 2pt;
+  border-right-width: 2pt;
+  border-top-width: 1pc;
 }