css: Improve transition test coverage

diff --git a/testsuite/css/transition.c b/testsuite/css/transition.c
index 991e1581a68acea8870c745aa4e19df4f6543c35..1e3f3674e31106bb036ae7b7b73f348cca6996a5 100644 (file)
--- a/testsuite/css/transition.c
+++ b/testsuite/css/transition.c
@@ -26,6 +26,7 @@
 #include "gtk/gtkcssnumbervalueprivate.h"
 #include "gtk/gtkcssstylepropertyprivate.h"
 #include "gtk/gtkcssstaticstyleprivate.h"
+#include "gtk/gtkcsspalettevalueprivate.h"
 
 static gboolean
 color_is_near (const GdkRGBA *color1,
@@ -66,6 +67,31 @@ value_is_near (int          prop,
       }
       break;
 
+    case GTK_CSS_PROPERTY_ICON_PALETTE:
+      {
+        const GdkRGBA *c1, *c2;
+
+        c1 = gtk_css_palette_value_get_color (value1, "error");
+        c2 = gtk_css_palette_value_get_color (value2, "error");
+
+        if (!color_is_near (c1, c2))
+          return FALSE;
+
+        c1 = gtk_css_palette_value_get_color (value1, "warning");
+        c2 = gtk_css_palette_value_get_color (value2, "warning");
+
+        if (!color_is_near (c1, c2))
+          return FALSE;
+
+        c1 = gtk_css_palette_value_get_color (value1, "test");
+        c2 = gtk_css_palette_value_get_color (value2, "test");
+
+        if (!color_is_near (c1, c2))
+          return FALSE;
+
+        return TRUE;
+      }
+
     case GTK_CSS_PROPERTY_FONT_SIZE:
       {
         double n1, n2;
@@ -126,13 +152,74 @@ static ValueTransitionTest tests[] = {
   { GTK_CSS_PROPERTY_FONT_FAMILY, "cantarell", "sans", 1, "sans" },
   { GTK_CSS_PROPERTY_FONT_FAMILY, "cantarell", "sans", 0.5, NULL },
   { GTK_CSS_PROPERTY_BACKGROUND_POSITION, "20px 10px", "40px", 0.5, "30px calc(5px + 25%)" },
+  { GTK_CSS_PROPERTY_BACKGROUND_POSITION, "left, right, 50% 80%",
+                                          "right, right, 100%",
+                                          0.5,
+                                          "50%, 100%, 75% 65%" },
   //TODO We don't currently transition border-image-width
   //{ GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH, "10px 20px", "0px", 0.5, "5px 10px 0.5px 0.5px" },
   { GTK_CSS_PROPERTY_FILTER, "none", "blur(6px)", 0.5, "blur(3px)" },
   { GTK_CSS_PROPERTY_FILTER, "none", "blur(6px),contrast(0.6)", 0.5, "blur(3px),contrast(0.3)" },
   { GTK_CSS_PROPERTY_FILTER, "contrast(0.6)", "blur(6px)", 0.5, NULL},
+  { GTK_CSS_PROPERTY_FILTER, "blur(3px) brightness(60) contrast(0.6) grayscale(60) hue-rotate(calc(5deg + 5deg)) invert(10) opacity(60) saturate(60) sepia(10) drop-shadow(3em 10px 10px red)",
+                             "blur(5px) brightness(80) contrast(0.8) grayscale(80) hue-rotate(30deg) invert(30) opacity(80) saturate(80) sepia(30) drop-shadow(5em 30px 30px red)",
+                             0.5,
+                             "blur(4px) brightness(70) contrast(0.7) grayscale(70) hue-rotate(20deg) invert(20) opacity(70) saturate(70) sepia(20) drop-shadow(4em 20px 20px red)" },
+  { GTK_CSS_PROPERTY_FILTER, "brightness(100)",
+                             "brightness(100) contrast(0.5) grayscale(20) hue-rotate(100deg) invert(100) opacity(0.5) saturate(0.5) sepia(0.5) blur(10px) drop-shadow(2px 2px 2px red)",
+                             0.5,
+                             "brightness(100) contrast(0.75) grayscale(10) hue-rotate(50deg) invert(50) opacity(0.75) saturate(0.75) sepia(0.25) blur(5px) drop-shadow(1px 1px 1px red)" },
+  { GTK_CSS_PROPERTY_FONT_FEATURE_SETTINGS, "\"dlig\" 0, \"clig\" off, \"c2sc\" 1",
+                                            "\"dlig\" 1, \"clig\" 0",
+                                            0.3,
+                                            "\"dlig\" 0, \"clig\" 0, \"c2sc\" 1" },
+  { GTK_CSS_PROPERTY_FONT_FEATURE_SETTINGS, "\"dlig\" 0, \"clig\" off, \"c2sc\" 1",
+                                            "\"dlig\" 1, \"clig\" 0",
+                                            0.6,
+                                            "\"dlig\" 1, \"clig\" 0, \"c2sc\" 1" },
+  { GTK_CSS_PROPERTY_FONT_VARIATION_SETTINGS, "\"wght\" 100, \"wdth\" 75",
+                                              "\"wght\" 400, \"slnt\" 10",
+                                              0.5,
+                                              "\"wght\" 250, \"wdth\" 75, \"slnt\" 10" },
+  { GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS, "0", "10px", 0.5, "5px" },
+  { GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS, "2px", "10px", 0.5, "6px" },
+  { GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS, "2px 10px", "10px", 0.5, "6px 10px" },
+  { GTK_CSS_PROPERTY_TRANSFORM, "translate(1px,2px) rotate(10deg) scale(1,1) skew(10deg,10deg) skewX(10deg) skewY(10deg)",
+                                "translate(3px,4px) rotate(50deg) scale(5,7) skew(20deg,30deg) skewX(20deg) skewY(30deg)",
+                                0.5,
+                                "translate(2px,3px) rotate(30deg) scale(3,4) skew(15deg,20deg) skewX(15deg) skewY(20deg)" },
+  { GTK_CSS_PROPERTY_TRANSFORM, "translate(1px,2px)",
+                                "translate(3px,4px) rotate(50deg) scale(5,7) skew(20deg,30deg) skewX(20deg) skewY(30deg)",
+                                0.5,
+                                "translate(2px,3px) rotate(25deg) scale(3,4) skew(10deg,15deg) skewX(10deg) skewY(15deg)" },
+  { GTK_CSS_PROPERTY_TRANSFORM, "translate(2px,3px)", "none", 0.5, "translate(1px,1.5px)" },
+  { GTK_CSS_PROPERTY_LINE_HEIGHT, "1.0", "2.0", 0.5, "1.5" },
+  { GTK_CSS_PROPERTY_LINE_HEIGHT, "10px", "20px", 0.5, "15px" },
+  { GTK_CSS_PROPERTY_LINE_HEIGHT, "100%", "200%", 0.5, "150%" },
+  { GTK_CSS_PROPERTY_BACKGROUND_SIZE, "25% 100px", "75% 200px", 0.5, "50% 150px" },
+  { GTK_CSS_PROPERTY_BACKGROUND_SIZE, "cover", "cover", 0.3, "cover" },
+  { GTK_CSS_PROPERTY_BACKGROUND_SIZE, "contain", "contain", 0.6, "contain" },
+  { GTK_CSS_PROPERTY_BACKGROUND_SIZE, "cover", "contain", 0, "cover" },
+  { GTK_CSS_PROPERTY_BACKGROUND_SIZE, "cover", "contain", 1, "contain" },
+  { GTK_CSS_PROPERTY_ICON_PALETTE, "error rgb(200,0,0), warning rgb(100,100,0), test rgb(20,30,40)",
+                                   "warning rgb(200,0,0), error rgb(100,100,0), test rgb(30,40,50)",
+                                   0.5,
+                                   "error rgb(150,50,0), test rgb(25,35,45), warning rgb(150,50,0)" },
 };
 
+static void
+error_cb (GtkCssParser         *parser,
+          const GtkCssLocation *start,
+          const GtkCssLocation *end,
+          const GError         *error,
+          gpointer              user_data)
+{
+  GError **e = (GError **)user_data;
+
+  g_print ("%lu:%lu - %lu:%lu: %s\n", start->lines, start->line_chars, end->lines, end->line_chars, error->message);
+  *e = g_error_copy (error);
+}
+
 static GtkCssValue *
 value_from_string (GtkStyleProperty *prop,
                    const char       *str)
@@ -140,10 +227,12 @@ value_from_string (GtkStyleProperty *prop,
   GBytes *bytes;
   GtkCssParser *parser;
   GtkCssValue *value;
+  GError *error = NULL;
 
   bytes = g_bytes_new_static (str, strlen (str));
-  parser = gtk_css_parser_new_for_bytes (bytes, NULL, NULL, NULL, NULL);
+  parser = gtk_css_parser_new_for_bytes (bytes, NULL, error_cb, &error, NULL);
   value = _gtk_style_property_parse_value (prop, parser);
+  g_assert_no_error (error);
   gtk_css_parser_unref (parser);
   g_bytes_unref (bytes);
 
@@ -175,7 +264,7 @@ test_transition (gconstpointer data)
   computed1 = _gtk_css_value_compute (value1, test->prop, provider, style, NULL);
 
   value2 = value_from_string (prop, test->value2);
-  g_assert_nonnull (value1);
+  g_assert_nonnull (value2);
   computed2 = _gtk_css_value_compute (value2, test->prop, provider, style, NULL);
 
   if (test->value3)