[gtk/wip/baedert/nodeeditor: 13/18] testsuite: Port GL tests to new syntax

[Timm Bäder <baedert src gnome org>]

commit 82c756d75cdc3b011e5c5dd8ba6e2542e1329f64
Author: Benjamin Otte <otte redhat com>
Date:   Tue Mar 19 05:30:55 2019 +0100

    testsuite: Port GL tests to new syntax
    
    Now that the syntax tries to follow the CSS specs more, we need to
    update our tests for the changes.

 testsuite/gsk/gl/clipped_rounded_clip.txt         | 12 ++++++------
 testsuite/gsk/gl/cross_fade.txt                   | 20 ++++++++++----------
 testsuite/gsk/gl/gradient_clipped.txt             | 14 +++++++-------
 testsuite/gsk/gl/gradient_simple.txt              | 20 ++++++++++----------
 testsuite/gsk/gl/opacity_clip.txt                 | 16 ++++++++--------
 testsuite/gsk/gl/outset_shadow_blurred_offset.txt | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_blurred_simple.txt | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_blurred_small.txt  | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_offset_both.txt    | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_offsetx.txt        | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_offsety.txt        | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_rounded1.txt       | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_rounded2.txt       | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_rounded_top.txt    | 14 +++++++-------
 testsuite/gsk/gl/outset_shadow_simple.txt         | 14 +++++++-------
 15 files changed, 111 insertions(+), 111 deletions(-)
---
diff --git a/testsuite/gsk/gl/clipped_rounded_clip.txt b/testsuite/gsk/gl/clipped_rounded_clip.txt
index 5f56f3e829..545e6045ac 100644
--- a/testsuite/gsk/gl/clipped_rounded_clip.txt
+++ b/testsuite/gsk/gl/clipped_rounded_clip.txt
@@ -1,10 +1,10 @@
 clip {
-  clip = (60, 80, 60, 70)
-  rounded_clip {
-    clip = (20, 50, 100, 100) 50
-    color {
-      bounds = (20, 50, 100, 100)
-      color = (1, 0, 0, 1)
+  clip: 60 80 60 70;
+  child: rounded-clip {
+    clip: 20 50 100 100 / 50;
+    child: color {
+      bounds: 20 50 100 100;
+      color: red;
     }
   }
 }
diff --git a/testsuite/gsk/gl/cross_fade.txt b/testsuite/gsk/gl/cross_fade.txt
index 70eb5184b4..6926c77815 100644
--- a/testsuite/gsk/gl/cross_fade.txt
+++ b/testsuite/gsk/gl/cross_fade.txt
@@ -1,13 +1,13 @@
-cross_fade {
-  progress = 0.5
-  color {
-    bounds = (0, 0, 200, 200)
-    color = (1, 1, 1, 1)
+cross-fade {
+  progress: 0.5;
+  start: color {
+    bounds: 0 0 200 200;
+    color: white;
   }
-  linear_gradient {
-    bounds = (100, 100, 200, 200)
-    start = (200, 100)
-    end = (200, 300)
-    stops = (0, (1, 0, 0, 1)) (1, (0, 1, 0, 1))
+  end: linear-gradient {
+    bounds: 100 100 200 200;
+    start: 200 100;
+    end: 200 300;
+    stops: 0 red, 1 blue;
   }
 }
diff --git a/testsuite/gsk/gl/gradient_clipped.txt b/testsuite/gsk/gl/gradient_clipped.txt
index dde5823c02..e2b469d219 100644
--- a/testsuite/gsk/gl/gradient_clipped.txt
+++ b/testsuite/gsk/gl/gradient_clipped.txt
@@ -1,9 +1,9 @@
-rounded_clip {
-  clip = (0, 0, 50, 100) 25
-  linear_gradient {
-    bounds = (0, 0, 50, 100)
-    start = (0, 0)
-    end = (0, 100)
-    stops = (0, (1, 0, 0, 1)) (1, (0, 0, 1, 1))
+rounded-clip {
+  clip: 0 0 50 100 / 25;
+  child: linear-gradient {
+    bounds: 0 0 50 100;
+    start: 0 0;
+    end: 0 100;
+    stops: 0 red, 1 blue;
   }
 }
diff --git a/testsuite/gsk/gl/gradient_simple.txt b/testsuite/gsk/gl/gradient_simple.txt
index f6cbdd9c28..a839260116 100644
--- a/testsuite/gsk/gl/gradient_simple.txt
+++ b/testsuite/gsk/gl/gradient_simple.txt
@@ -1,14 +1,14 @@
 container {
-  linear_gradient {
-    bounds = (0, 0, 50, 100)
-    start = (0, 0)
-    end = (0, 100)
-    stops = (0, (1, 0, 0, 1)) (1, (0, 0, 1, 1))
+  linear-gradient {
+    bounds: 0 0 50 100;
+    start: 0 0;
+    end: 0 100;
+    stops: 0 red, 1 blue;
   }
-  linear_gradient {
-    bounds = (50, 0, 50, 100)
-    start = (50, 0)
-    end = (100, 0)
-    stops = (0, (1, 0, 0, 1)) (1, (0, 0, 1, 1))
+  linear-gradient {
+    bounds: 50 0 50 100;
+    start: 50 0;
+    end: 100 0;
+    stops: 0 red, 1 blue;
   }
 }
diff --git a/testsuite/gsk/gl/opacity_clip.txt b/testsuite/gsk/gl/opacity_clip.txt
index fe6ed55c00..8b9991f797 100644
--- a/testsuite/gsk/gl/opacity_clip.txt
+++ b/testsuite/gsk/gl/opacity_clip.txt
@@ -1,12 +1,12 @@
 clip {
-  clip = (50, 50, 50, 50)
-  opacity {
-    opacity = 0.4
-    rounded_clip {
-      clip = (50, 50, 100, 100) 50
-      color {
-        bounds = (50, 50, 100, 100)
-        color = (1, 0, 0, 1)
+  clip: 50 50 50 50;
+  child: opacity {
+    opacity: 0.4;
+    child: rounded-clip {
+      clip: 50 50 100 100 / 50;
+      child: color {
+        bounds: 50 50 100 100;
+        color: red;
       }
     }
   }
diff --git a/testsuite/gsk/gl/outset_shadow_blurred_offset.txt 
b/testsuite/gsk/gl/outset_shadow_blurred_offset.txt
index 9d48a95282..0fb597d742 100644
--- a/testsuite/gsk/gl/outset_shadow_blurred_offset.txt
+++ b/testsuite/gsk/gl/outset_shadow_blurred_offset.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 40, 40) (5.714286, 5.714286) (2.857143, 2.857143) (17.142859, 17.142859) (22.857143, 
22.857143)
-  color = (0, 0, 0, 0.5)
-  dx = 20
-  dy = 20
-  spread = 1
-  blur_radius = 4
+outset-shadow {
+  outline: 100 100 40 40 / 5.714286 2.857143 17.142859 22.857143;
+  color: rgba(0, 0, 0, 0.5);
+  dx: 20;
+  dy: 20;
+  spread: 1;
+  blur: 4;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_blurred_simple.txt 
b/testsuite/gsk/gl/outset_shadow_blurred_simple.txt
index 3fb1e7e196..aa1731d9a8 100644
--- a/testsuite/gsk/gl/outset_shadow_blurred_simple.txt
+++ b/testsuite/gsk/gl/outset_shadow_blurred_simple.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 200, 200)
-  color = (0, 0, 0, 1)
-  dx = 0
-  dy = 0
-  spread = 0
-  blur_radius = 40
+outset-shadow {
+  outline: 100 100 200 200;
+  color: black;
+  dx: 0;
+  dy: 0;
+  spread: 0;
+  blur: 40;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_blurred_small.txt 
b/testsuite/gsk/gl/outset_shadow_blurred_small.txt
index 01b4127d09..1f8374ab33 100644
--- a/testsuite/gsk/gl/outset_shadow_blurred_small.txt
+++ b/testsuite/gsk/gl/outset_shadow_blurred_small.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 40, 40) (5.714286, 5.714286) (2.857143, 2.857143) (17.142859, 17.142859) (22.857143, 
22.857143)
-  color = (0, 0, 0, 0.5)
-  dx = 0
-  dy = 0
-  spread = 1
-  blur_radius = 4
+outset-shadow {
+  outline: 100 100 40 40 / 5.714286 2.857143 17.142859 22.857143;
+  color: rgba(0, 0, 0, 0.5);
+  dx: 0;
+  dy: 0;
+  spread: 1;
+  blur: 4;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_offset_both.txt b/testsuite/gsk/gl/outset_shadow_offset_both.txt
index 69982be070..1e05bc4d6d 100644
--- a/testsuite/gsk/gl/outset_shadow_offset_both.txt
+++ b/testsuite/gsk/gl/outset_shadow_offset_both.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 100, 100)
-  color = (0, 0, 0, 1)
-  dx = -100
-  dy = 100
-  spread = 10
-  blur_radius = 0
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: -100;
+  dy: 100;
+  spread: 10;
+  blur: 0;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_offsetx.txt b/testsuite/gsk/gl/outset_shadow_offsetx.txt
index 8e198a875c..f78d0b47cd 100644
--- a/testsuite/gsk/gl/outset_shadow_offsetx.txt
+++ b/testsuite/gsk/gl/outset_shadow_offsetx.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 100, 100)
-  color = (0, 0, 0, 1)
-  dx = 10
-  dy = 0
-  spread = 10
-  blur_radius = 0
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: 10;
+  dy: 0;
+  spread: 10;
+  blur: 0;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_offsety.txt b/testsuite/gsk/gl/outset_shadow_offsety.txt
index b6b559976e..91fb1a7bd5 100644
--- a/testsuite/gsk/gl/outset_shadow_offsety.txt
+++ b/testsuite/gsk/gl/outset_shadow_offsety.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 100, 100)
-  color = (0, 0, 0, 1)
-  dx = 0
-  dy = 10
-  spread = 10
-  blur_radius = 0
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: 0;
+  dy: 10;
+  spread: 10;
+  blur: 0;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_rounded1.txt b/testsuite/gsk/gl/outset_shadow_rounded1.txt
index 77c909fc26..b59c038696 100644
--- a/testsuite/gsk/gl/outset_shadow_rounded1.txt
+++ b/testsuite/gsk/gl/outset_shadow_rounded1.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 200, 200) 50 0 50 0
-  color = (0, 0, 0, 0.5)
-  dx = 10
-  dy = 10
-  spread = 30
-  blur_radius = 0
+outset-shadow {
+  outline: 100 100 200 200 / 50 0 50 0;
+  color: rgba(0, 0, 0, 0.5);
+  dx: 10;
+  dy: 10;
+  spread: 30;
+  blur: 0;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_rounded2.txt b/testsuite/gsk/gl/outset_shadow_rounded2.txt
index 85ffd0b7f6..a8b0335e52 100644
--- a/testsuite/gsk/gl/outset_shadow_rounded2.txt
+++ b/testsuite/gsk/gl/outset_shadow_rounded2.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 200, 200) 0 100 0 100
-  color = (0, 0, 0, 0.5)
-  dx = 10
-  dy = 10
-  spread = 30
-  blur_radius = 0
+outset-shadow {
+  outline: 100 100 200 200 / 0 100 0 100;
+  color: rgba(0, 0, 0, 0.5);
+  dx: 10;
+  dy: 10;
+  spread: 30;
+  blur: 0;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_rounded_top.txt b/testsuite/gsk/gl/outset_shadow_rounded_top.txt
index a16f41dc26..8259016c28 100644
--- a/testsuite/gsk/gl/outset_shadow_rounded_top.txt
+++ b/testsuite/gsk/gl/outset_shadow_rounded_top.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 200, 200) 7 7 0 0
-  color = (0, 0, 0, 1)
-  dx = 0
-  dy = 0
-  spread = 1
-  blur_radius = 0
+outset-shadow {
+  outline: 100 100 200 200 / 7 7 0 0;
+  color: black;
+  dx: 0;
+  dy: 0;
+  spread: 1;
+  blur: 0;
 }
diff --git a/testsuite/gsk/gl/outset_shadow_simple.txt b/testsuite/gsk/gl/outset_shadow_simple.txt
index 92121e5865..45bc2724f6 100644
--- a/testsuite/gsk/gl/outset_shadow_simple.txt
+++ b/testsuite/gsk/gl/outset_shadow_simple.txt
@@ -1,8 +1,8 @@
-outset_shadow {
-  outline = (100, 100, 100, 100)
-  color = (0, 0, 0, 1)
-  dx = 0
-  dy = 0
-  spread = 10
-  blur_radius = 0
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: 0;
+  dy: 0;
+  spread: 10;
+  blur: 0;
 }