testsuite: Remove serialize-deserialize test

The serialize-deserialize test is completely handled via the new
nodeparser tests.

So move those tests over and delete the old test binary.

15 files changed, 112 insertions, 92 deletions

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index cecc0ebed0..4751dfd537 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -17,14 +17,6 @@ node_parser = executable(
   install_dir: testexecdir
 )
 
-serialize_deserialize = executable(
-  'serialize-deserialize',
-  ['serialize-deserialize.c'],
-  dependencies: libgtk_dep,
-  install: get_option('install-tests'),
-  install_dir: testexecdir,
-)
-
 compare_render_tests = [
   'blend-normal',
   'blend-difference',
@@ -88,6 +80,9 @@ foreach renderer : renderers
 endforeach
 
 node_parser_tests = [
+  'blend.node',
+  'border.node',
+  'color.node',
   'crash1.errors',
   'crash1.node',
   'crash1.ref.node',
@@ -99,6 +94,7 @@ node_parser_tests = [
   'crash4.errors',
   'crash4.node',
   'crash4.ref.node',
+  'debug.node',
   'empty-blend.node',
   'empty-blend.ref.node',
   'empty-blur.node',
@@ -137,6 +133,10 @@ node_parser_tests = [
   'empty-texture.ref.node',
   'empty-transform.node',
   'empty-transform.ref.node',
+  'rounded-rect.node',
+  'shadow.node',
+  'testswitch.node',
+  'widgetfactory.node',
 ]
 
 foreach test : node_parser_tests
@@ -155,28 +155,3 @@ foreach test : node_parser_tests
          suite: 'gsk')
   endif
 endforeach
-
-serialize_deserialize_tests = [
-  'blend',
-  'border',
-  'color',
-  'debug',
-  'rounded-rect',
-  'shadow',
-  'testswitch',
-  'widgetfactory',
-]
-
-foreach test : serialize_deserialize_tests
-  test('serialize-deserialize ' + test, serialize_deserialize,
-       args: [join_paths(meson.current_source_dir(), 'serializedeserialize', test + '.node')],
-       env: [ 'GIO_USE_VOLUME_MONITOR=unix',
-              'GSETTINGS_BACKEND=memory',
-              'GTK_CSD=1',
-              'G_ENABLE_DIAGNOSTIC=0',
-              'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
-              'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-              'GSK_RENDERER=opengl'
-            ],
-       suite: 'gsk')
-endforeach
diff --git a/testsuite/gsk/serializedeserialize/blend.node b/testsuite/gsk/nodeparser/blend.node
index 0b228ade85..0b228ade85 100644
--- a/testsuite/gsk/serializedeserialize/blend.node
+++ b/testsuite/gsk/nodeparser/blend.node
diff --git a/testsuite/gsk/nodeparser/blend.ref.node b/testsuite/gsk/nodeparser/blend.ref.node
new file mode 100644
index 0000000000..49dd83f842
--- /dev/null
+++ b/testsuite/gsk/nodeparser/blend.ref.node
@@ -0,0 +1,24 @@
+blend {
+  bottom: container {
+  }
+  top: container {
+  }
+}
+blend {
+  bottom: container {
+  }
+  mode: color-dodge;
+  top: container {
+  }
+}
+blend {
+  bottom: color {
+    bounds: 0 0 50 50;
+    color: rgb(255,0,204);
+  }
+  mode: difference;
+  top: color {
+    bounds: 0 0 50 50;
+    color: rgb(255,0,204);
+  }
+}
diff --git a/testsuite/gsk/serializedeserialize/border.node b/testsuite/gsk/nodeparser/border.node
index 89b490329f..89b490329f 100644
--- a/testsuite/gsk/serializedeserialize/border.node
+++ b/testsuite/gsk/nodeparser/border.node
diff --git a/testsuite/gsk/nodeparser/border.ref.node b/testsuite/gsk/nodeparser/border.ref.node
new file mode 100644
index 0000000000..4a67ccd849
--- /dev/null
+++ b/testsuite/gsk/nodeparser/border.ref.node
@@ -0,0 +1,4 @@
+border {
+  colors: rgb(213,208,204);
+  outline: -1 -1 50 26 / 13;
+}
diff --git a/testsuite/gsk/serializedeserialize/color.node b/testsuite/gsk/nodeparser/color.node
index acbc79288d..acbc79288d 100644
--- a/testsuite/gsk/serializedeserialize/color.node
+++ b/testsuite/gsk/nodeparser/color.node
diff --git a/testsuite/gsk/nodeparser/color.ref.node b/testsuite/gsk/nodeparser/color.ref.node
new file mode 100644
index 0000000000..bf5ba1027a
--- /dev/null
+++ b/testsuite/gsk/nodeparser/color.ref.node
@@ -0,0 +1,4 @@
+color {
+  bounds: 100 100 200 300;
+  color: rgb(255,0,0);
+}
diff --git a/testsuite/gsk/serializedeserialize/debug.node b/testsuite/gsk/nodeparser/debug.node
index cf3c2634e6..cd68defd52 100644
--- a/testsuite/gsk/serializedeserialize/debug.node
+++ b/testsuite/gsk/nodeparser/debug.node
@@ -1,4 +1,5 @@
 debug {
+  child: container {
+  }
   message: "I'm a debug node.";
-  child: container {}
 }
diff --git a/testsuite/gsk/serializedeserialize/rounded-rect.node b/testsuite/gsk/nodeparser/rounded-rect.node
index 5aeeb0b9f1..5aeeb0b9f1 100644
--- a/testsuite/gsk/serializedeserialize/rounded-rect.node
+++ b/testsuite/gsk/nodeparser/rounded-rect.node
diff --git a/testsuite/gsk/nodeparser/rounded-rect.ref.node b/testsuite/gsk/nodeparser/rounded-rect.ref.node
new file mode 100644
index 0000000000..16c12d0afd
--- /dev/null
+++ b/testsuite/gsk/nodeparser/rounded-rect.ref.node
@@ -0,0 +1,63 @@
+border {
+  outline: 0 0 100 100;
+}
+border {
+  outline: 0 0 100 100 / 50;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0;
+}
+border {
+  outline: 0 0 100 100 / 50;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 50 50 50;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 50 50 50;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 50 50 50;
+}
+border {
+  outline: 0 0 100 100 / 50 50 50 50 / 25 0 25 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 50 50 50 50 / 25 0 25 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 50 50 50 50 / 25 0 25 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
+border {
+  outline: 0 0 100 100 / 100 0 100 0 / 50 0 50 0;
+}
diff --git a/testsuite/gsk/serializedeserialize/shadow.node b/testsuite/gsk/nodeparser/shadow.node
index a957ce7988..a957ce7988 100644
--- a/testsuite/gsk/serializedeserialize/shadow.node
+++ b/testsuite/gsk/nodeparser/shadow.node
diff --git a/testsuite/gsk/nodeparser/shadow.ref.node b/testsuite/gsk/nodeparser/shadow.ref.node
new file mode 100644
index 0000000000..bf4c27b69a
--- /dev/null
+++ b/testsuite/gsk/nodeparser/shadow.ref.node
@@ -0,0 +1,7 @@
+shadow {
+  child: color {
+    bounds: 100 100 100 100;
+    color: rgb(0,128,0);
+  }
+  shadows: rgb(255,0,0) 10 10 4, rgb(0,0,255) -10 -10 8;
+}
diff --git a/testsuite/gsk/serializedeserialize/testswitch.node b/testsuite/gsk/nodeparser/testswitch.node
index 89d884bcda..89d884bcda 100644
--- a/testsuite/gsk/serializedeserialize/testswitch.node
+++ b/testsuite/gsk/nodeparser/testswitch.node
diff --git a/testsuite/gsk/serializedeserialize/widgetfactory.node b/testsuite/gsk/nodeparser/widgetfactory.node
index 36b5f1b328..36b5f1b328 100644
--- a/testsuite/gsk/serializedeserialize/widgetfactory.node
+++ b/testsuite/gsk/nodeparser/widgetfactory.node
diff --git a/testsuite/gsk/serialize-deserialize.c b/testsuite/gsk/serialize-deserialize.c
deleted file mode 100644
index 452093c6ec..0000000000
--- a/testsuite/gsk/serialize-deserialize.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <gtk/gtk.h>
-
-static void
-deserialize_error_func (const GtkCssSection *section,
-                        const GError         *error,
-                        gpointer              user_data)
-{
-  char *section_str = gtk_css_section_to_string (section);
-
-  g_error ("Error at %s: %s", section_str, error->message);
-
-  free (section_str);
-}
-
-int
-main (int argc, char **argv)
-{
-  GError *error = NULL;
-  GskRenderNode *node;
-  GskRenderNode *deserialized;
-  GBytes *bytes;
-  GFile *file;
-
-  g_assert (argc == 2);
-
-  gtk_init ();
-
-  file = g_file_new_for_commandline_arg (argv[1]);
-  bytes = g_file_load_bytes (file, NULL, NULL, &error);
-  g_assert_no_error (error);
-  g_assert (bytes != NULL);
-
-  node = gsk_render_node_deserialize (bytes, deserialize_error_func, NULL);
-  g_assert_no_error (error);
-
-  /* Now serialize */
-  g_bytes_unref (bytes);
-  bytes = gsk_render_node_serialize (node);
-  /* and deserialize again... */
-  deserialized = gsk_render_node_deserialize (bytes, deserialize_error_func, NULL);
-  if (error)
-    g_message ("OUTPUT:\n%.*s", (int)g_bytes_get_size (bytes), (char *)g_bytes_get_data (bytes, NULL));
-
-  g_assert_no_error (error);
-
-  /* And check if that all worked. */
-  g_assert_cmpint (gsk_render_node_get_node_type (deserialized), ==,
-                   gsk_render_node_get_node_type (node));
-
-
-  g_clear_error (&error);
-  g_clear_pointer (&node, gsk_render_node_unref);
-  g_clear_pointer (&deserialized, gsk_render_node_unref);
-  g_bytes_unref (bytes);
-  g_object_unref (file);
-
-  return 0;
-}