fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 03:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Refactor get_presentation

Browse source 
In the future more than one test group will want to use presentation
feedback, so let's pull the basics into weston-test-client-helper

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2025-09-25 09:34:55 -05:00
parent 5eb5c4991d
commit 08f9d791b5
3 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/presentation-test.c
View file

@ -51,34 +51,6 @@ fixture_setup(struct weston_test_harness *harness)
}
DECLARE_FIXTURE_SETUP(fixture_setup);
static struct wp_presentation *
get_presentation(struct client *client)
{
struct global *g;
struct global *global_pres = NULL;
struct wp_presentation *pres;
wl_list_for_each(g, &client->global_list, link) {
if (strcmp(g->interface, wp_presentation_interface.name))
continue;
if (global_pres)
test_assert_not_reached("multiple presentation objects");
global_pres = g;
}
test_assert_ptr_not_null(global_pres);
test_assert_u32_eq(global_pres->version, 1);
pres = wl_registry_bind(client->wl_registry, global_pres->name,
&wp_presentation_interface, 1);
test_assert_ptr_not_null(pres);
return pres;
}
struct feedback {
struct client *client;
struct wp_presentation_feedback *obj;
@ -232,7 +204,7 @@ TEST(test_presentation_feedback_simple)
client = create_client_and_test_surface(100, 50, 123, 77);
test_assert_ptr_not_null(client);
pres = get_presentation(client);
pres = client_get_presentation(client);
wl_surface_attach(client->surface->wl_surface,
client->surface->buffer->proxy, 0, 0);

30
tests/weston-test-client-helper.c
View file

@ -48,6 +48,7 @@
#include "weston-test-assert.h"
#include "image-iter.h"
#include "weston-output-capture-client-protocol.h"
#include "presentation-time-client-protocol.h"
#define max(a, b) (((a) > (b)) ? (a) : (b))
#define min(a, b) (((a) > (b)) ? (b) : (a))
@ -2625,3 +2626,32 @@ client_get_subcompositor(struct client *client)
return sub;
}
struct wp_presentation *
client_get_presentation(struct client *client)
{
struct global *g;
struct global *global_pres = NULL;
struct wp_presentation *pres;
wl_list_for_each(g, &client->global_list, link) {
if (strcmp(g->interface, wp_presentation_interface.name))
continue;
if (global_pres)
test_assert_not_reached("multiple presentation objects");
global_pres = g;
}
test_assert_ptr_not_null(global_pres);
test_assert_u32_eq(global_pres->version, 1);
pres = wl_registry_bind(client->wl_registry, global_pres->name,
&wp_presentation_interface, 1);
test_assert_ptr_not_null(pres);
return pres;
}

3
tests/weston-test-client-helper.h
View file

@ -426,4 +426,7 @@ assert_surface_matches(struct wet_testsuite_data *suite_data,
struct wl_subcompositor *
client_get_subcompositor(struct client *client);
struct wp_presentation *
client_get_presentation(struct client *client);
#endif