[gtk/wip/otte/for-master: 96/96] testsuite: Remove serialize-deserialize test

[Benjamin Otte <otte src gnome org>]

commit 63a8144e1ad02b8660d1041b7853af9a14eba92e
Author: Benjamin Otte <otte redhat com>
Date:   Mon May 20 03:38:45 2019 +0200

    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.

 testsuite/gsk/meson.build                          | 41 +++-----------
 .../blend.node                                     |  0
 testsuite/gsk/nodeparser/blend.ref.node            | 24 +++++++++
 .../border.node                                    |  0
 testsuite/gsk/nodeparser/border.ref.node           |  4 ++
 .../color.node                                     |  0
 testsuite/gsk/nodeparser/color.ref.node            |  4 ++
 .../debug.node                                     |  3 +-
 .../rounded-rect.node                              |  0
 testsuite/gsk/nodeparser/rounded-rect.ref.node     | 63 ++++++++++++++++++++++
 .../shadow.node                                    |  0
 testsuite/gsk/nodeparser/shadow.ref.node           |  7 +++
 .../testswitch.node                                |  0
 .../widgetfactory.node                             |  0
 testsuite/gsk/serialize-deserialize.c              | 58 --------------------
 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
similarity index 100%
rename from testsuite/gsk/serializedeserialize/blend.node
rename to 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
similarity index 100%
rename from testsuite/gsk/serializedeserialize/border.node
rename to 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
similarity index 100%
rename from testsuite/gsk/serializedeserialize/color.node
rename to 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
similarity index 62%
rename from testsuite/gsk/serializedeserialize/debug.node
rename to 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
similarity index 100%
rename from testsuite/gsk/serializedeserialize/rounded-rect.node
rename to 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
similarity index 100%
rename from testsuite/gsk/serializedeserialize/shadow.node
rename to 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
similarity index 100%
rename from testsuite/gsk/serializedeserialize/testswitch.node
rename to testsuite/gsk/nodeparser/testswitch.node
diff --git a/testsuite/gsk/serializedeserialize/widgetfactory.node 
b/testsuite/gsk/nodeparser/widgetfactory.node
similarity index 100%
rename from testsuite/gsk/serializedeserialize/widgetfactory.node
rename to testsuite/gsk/nodeparser/widgetfactory.node