[mutter] tests/clutter: Remove tests testing or relying on ClutterTexture



commit 244f55df2878b6746774a87d3abb89e707da1361
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Tue Nov 12 18:41:58 2019 +0100

    tests/clutter: Remove tests testing or relying on ClutterTexture
    
    ClutterTexture is going to be removed, so remove interactive tests that
    stand in the way for that. Some test texture features, while some makes
    heavy use of ClutterTexture to implement their testing. Remove these
    tests to prepare for the removal of ClutterTexture.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/932

 src/tests/clutter/conform/actor-destroy.c          |  18 +-
 src/tests/clutter/conform/cairo-texture.c          | 198 ---------------------
 src/tests/clutter/interactive/.gitignore           |   1 -
 src/tests/clutter/interactive/meson.build          |   5 -
 src/tests/clutter/interactive/test-fbo.c           | 111 ------------
 src/tests/clutter/interactive/test-script.json     |  18 --
 .../clutter/interactive/test-stage-read-pixels.c   | 174 ------------------
 src/tests/clutter/interactive/test-texture-async.c | 160 -----------------
 .../clutter/interactive/test-texture-material.c    |  49 -----
 .../clutter/interactive/test-texture-slicing.c     | 131 --------------
 10 files changed, 1 insertion(+), 864 deletions(-)
---
diff --git a/src/tests/clutter/conform/actor-destroy.c b/src/tests/clutter/conform/actor-destroy.c
index 54d72d21c..09a931d79 100644
--- a/src/tests/clutter/conform/actor-destroy.c
+++ b/src/tests/clutter/conform/actor-destroy.c
@@ -16,7 +16,6 @@ struct _TestDestroy
 
   ClutterActor *bg;
   ClutterActor *label;
-  ClutterActor *tex;
 
   GList *children;
 };
@@ -78,7 +77,7 @@ test_destroy_destroy (ClutterActor *self)
 {
   TestDestroy *test = TEST_DESTROY (self);
 
-  g_assert_cmpuint (g_list_length (test->children), ==, 4);
+  g_assert_cmpuint (g_list_length (test->children), ==, 3);
 
   if (test->bg != NULL)
     {
@@ -102,17 +101,6 @@ test_destroy_destroy (ClutterActor *self)
       test->label = NULL;
     }
 
-  if (test->tex != NULL)
-    {
-      if (g_test_verbose ())
-        g_print ("Destroying '%s' (type:%s)\n",
-                 clutter_actor_get_name (test->tex),
-                 G_OBJECT_TYPE_NAME (test->tex));
-
-      clutter_actor_destroy (test->tex);
-      test->tex = NULL;
-    }
-
   g_assert_cmpuint (g_list_length (test->children), ==, 1);
 
   if (CLUTTER_ACTOR_CLASS (test_destroy_parent_class)->destroy)
@@ -139,10 +127,6 @@ test_destroy_init (TestDestroy *self)
   self->label = clutter_text_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (self), self->label);
   clutter_actor_set_name (self->label, "Label");
-
-  self->tex = clutter_texture_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (self), self->tex);
-  clutter_actor_set_name (self->tex, "Texture");
 }
 
 static void
diff --git a/src/tests/clutter/interactive/.gitignore b/src/tests/clutter/interactive/.gitignore
index 7fde7f98f..97afd48b9 100644
--- a/src/tests/clutter/interactive/.gitignore
+++ b/src/tests/clutter/interactive/.gitignore
@@ -47,7 +47,6 @@
 /test-table-layout
 /test-text
 /test-text-field
-/test-texture-async
 /test-texture-material
 /test-texture-quality
 /test-texture-slicing
diff --git a/src/tests/clutter/interactive/meson.build b/src/tests/clutter/interactive/meson.build
index d09045b0d..e456c448d 100644
--- a/src/tests/clutter/interactive/meson.build
+++ b/src/tests/clutter/interactive/meson.build
@@ -15,9 +15,6 @@ clutter_tests_interactive_link_args = [
 ]
 
 clutter_tests_interactive_test_sources = [
-  'test-texture-slicing.c',
-  'test-texture-async.c',
-  'test-texture-material.c',
   'test-events.c',
   'test-actors.c',
   'test-shader-effects.c',
@@ -25,13 +22,11 @@ clutter_tests_interactive_test_sources = [
   'test-grab.c',
   'test-cogl-shader-glsl.c',
   'test-state.c',
-  'test-fbo.c',
   'test-cogl-tex-tile.c',
   'test-cogl-tex-convert.c',
   'test-cogl-offscreen.c',
   'test-cogl-tex-polygon.c',
   'test-cogl-multitexture.c',
-  'test-stage-read-pixels.c',
   'test-paint-wrapper.c',
   'test-layout.c',
   'test-animation.c',
diff --git a/src/tests/clutter/interactive/test-script.json b/src/tests/clutter/interactive/test-script.json
index 2132c72d8..ce135cb3a 100644
--- a/src/tests/clutter/interactive/test-script.json
+++ b/src/tests/clutter/interactive/test-script.json
@@ -33,24 +33,6 @@
           { "name" : "button-press-event", "handler" : "clutter_main_quit" }
         ]
       }, 
-      {
-        "id" : "red-hand",
-        "type" : "ClutterTexture",
-        "filename" : "redhand.png",
-        "position" : { "x" : 100.0, "y" : 100.0 },
-        "width" : "20 mm",
-        "keep-aspect-ratio" : true,
-        "anchor-x" : "5 em",
-        "anchor-y" : "5 pt",
-        "opacity" : 100
-      },
-      {
-        "id" : "red-hand-clone",
-        "type" : "ClutterClone",
-        "source" : "red-hand",
-        "position" : [ 250.0, 150.0 ],
-        "opacity" : 100
-      },
       {
         "id" : "label",
         "type" : "ClutterText",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]