diff --git a/tests/Makefile.am b/tests/Makefile.am index d7014bed..5244905b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,13 +3,13 @@ TESTS = $(module_tests) $(weston_tests) module_tests = \ surface-test.la \ client-test.la \ - text-test.la \ surface-global-test.la weston_tests = \ keyboard-test \ event-test \ - button-test + button-test \ + text-test TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-tests-env @@ -27,7 +27,6 @@ check_LTLIBRARIES = \ check_PROGRAMS = \ test-client \ - test-text-client \ $(weston_tests) AM_CFLAGS = $(GCC_CFLAGS) @@ -39,14 +38,10 @@ test_runner_src = test-runner.c test-runner.h surface_global_test_la_SOURCES = surface-global-test.c $(test_runner_src) surface_test_la_SOURCES = surface-test.c $(test_runner_src) client_test_la_SOURCES = client-test.c $(test_runner_src) -text_test_la_SOURCES = text-test.c $(test_runner_src) test_client_SOURCES = test-client.c test_client_LDADD = $(SIMPLE_CLIENT_LIBS) -test_text_client_SOURCES = test-text-client.c ../clients/text-protocol.c -test_text_client_LDADD = $(SIMPLE_CLIENT_LIBS) - weston_test = weston-test.la weston_test_la_LIBADD = $(COMPOSITOR_LIBS) \ ../shared/libshared.la @@ -78,6 +73,12 @@ event_test_LDADD = $(weston_test_client_libs) button_test_SOURCES = button-test.c $(weston_test_client_src) button_test_LDADD = $(weston_test_client_libs) +text_test_SOURCES = \ + text-test.c \ + ../clients/text-protocol.c \ + $(weston_test_client_src) +text_test_LDADD = $(weston_test_client_libs) + matrix_test_SOURCES = \ matrix-test.c \ $(top_srcdir)/shared/matrix.c \ diff --git a/tests/test-text-client.c b/tests/test-text-client.c deleted file mode 100644 index 73423811..00000000 --- a/tests/test-text-client.c +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright © 2012 Intel Corporation - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include "../clients/text-client-protocol.h" - -struct display { - struct wl_display *display; - struct wl_registry *registry; - struct wl_compositor *compositor; - - struct wl_surface *surface; - struct wl_seat *seat; - - struct text_model_factory *factory; - struct text_model *text_model; - - unsigned int activated; - unsigned int deactivated; -}; - -static void -text_model_commit_string(void *data, - struct text_model *text_model, - const char *text, - uint32_t index) -{ -} - -static void -text_model_preedit_string(void *data, - struct text_model *text_model, - const char *text, - uint32_t index) -{ -} - -static void -text_model_delete_surrounding_text(void *data, - struct text_model *text_model, - int32_t index, - uint32_t length) -{ -} - -static void -text_model_preedit_styling(void *data, - struct text_model *text_model) -{ -} - -static void -text_model_key(void *data, - struct text_model *text_model, - uint32_t key, - uint32_t state) -{ -} - -static void -text_model_selection_replacement(void *data, - struct text_model *text_model) -{ -} - -static void -text_model_direction(void *data, - struct text_model *text_model) -{ -} - -static void -text_model_locale(void *data, - struct text_model *text_model) -{ -} - -static void -text_model_enter(void *data, - struct text_model *text_model, - struct wl_surface *surface) - -{ - struct display *display = data; - - fprintf(stderr, "%s\n", __FUNCTION__); - - display->activated += 1; -} - -static void -text_model_leave(void *data, - struct text_model *text_model) -{ - struct display *display = data; - - display->deactivated += 1; -} - -static const struct text_model_listener text_model_listener = { - text_model_commit_string, - text_model_preedit_string, - text_model_delete_surrounding_text, - text_model_preedit_styling, - text_model_key, - text_model_selection_replacement, - text_model_direction, - text_model_locale, - text_model_enter, - text_model_leave -}; - -static void -handle_global(void *data, - struct wl_registry *registry, uint32_t id, - const char *interface, uint32_t version) -{ - struct display *display = data; - - if (strcmp(interface, "wl_compositor") == 0) { - display->compositor = - wl_registry_bind(display->registry, - id, &wl_compositor_interface, 1); - } else if (strcmp(interface, "wl_seat") == 0) { - display->seat = wl_registry_bind(display->registry, id, - &wl_seat_interface, 1); - } else if (strcmp(interface, "text_model_factory") == 0) { - display->factory = wl_registry_bind(display->registry, id, - &text_model_factory_interface, 1); - } -} - -static const struct wl_registry_listener registry_listener = { - handle_global -}; - -static void -create_surface(int fd, struct display *display) -{ - char buf[64]; - int len; - - display->surface = wl_compositor_create_surface(display->compositor); - wl_display_flush(display->display); - - len = snprintf(buf, sizeof buf, "surface %d\n", - wl_proxy_get_id((struct wl_proxy *) display->surface)); - assert(write(fd, buf, len) == len); -} - -static void -create_text_model(int fd, struct display *display) -{ - char buf[64]; - int len; - - display->text_model = text_model_factory_create_text_model(display->factory); - text_model_add_listener(display->text_model, &text_model_listener, display); - wl_display_flush(display->display); - - len = snprintf(buf, sizeof buf, "text_model %d\n", - wl_proxy_get_id((struct wl_proxy *) display->text_model)); - assert(write(fd, buf, len) == len); -} - -static void -write_state(int fd, struct display *display) -{ - char buf[64]; - int len; - - wl_display_flush(display->display); - len = snprintf(buf, sizeof buf, "activated %u deactivated %u\n", - display->activated, display->deactivated); - assert(write(fd, buf, len) == len); - wl_display_roundtrip(display->display); -} - -static void -activate_text_model(int fd, struct display *display) -{ - write_state(fd, display); - - text_model_activate(display->text_model, display->seat, display->surface); - - wl_display_flush(display->display); - wl_display_roundtrip(display->display); -} - -static void -deactivate_text_model(int fd, struct display *display) -{ - write_state(fd, display); - - text_model_deactivate(display->text_model, display->seat); - - wl_display_flush(display->display); - wl_display_roundtrip(display->display); -} - -int main(int argc, char *argv[]) -{ - struct display *display; - char buf[256], *p; - int ret, fd; - - display = malloc(sizeof *display); - assert(display); - - display->display = wl_display_connect(NULL); - assert(display->display); - - display->activated = 0; - display->deactivated = 0; - - display->registry = wl_display_get_registry(display->display); - wl_registry_add_listener(display->registry, - ®istry_listener, display); - wl_display_dispatch(display->display); - wl_display_dispatch(display->display); - - fd = 0; - p = getenv("TEST_SOCKET"); - if (p) - fd = strtol(p, NULL, 0); - - while (1) { - ret = read(fd, buf, sizeof buf); - if (ret == -1) { - fprintf(stderr, "read error: fd %d, %m\n", fd); - return -1; - } - - fprintf(stderr, "test-client: got %.*s\n", ret - 1, buf); - - if (strncmp(buf, "bye\n", ret) == 0) { - return 0; - } else if (strncmp(buf, "create-surface\n", ret) == 0) { - create_surface(fd, display); - } else if (strncmp(buf, "create-text-model\n", ret) == 0) { - create_text_model(fd, display); - } else if (strncmp(buf, "activate-text-model\n", ret) == 0) { - activate_text_model(fd, display); - } else if (strncmp(buf, "deactivate-text-model\n", ret) == 0) { - deactivate_text_model(fd, display); - } else if (strncmp(buf, "assert-state\n", ret) == 0) { - write_state(fd, display); - } else { - fprintf(stderr, "unknown command %.*s\n", ret, buf); - return -1; - } - } - - assert(0); -} diff --git a/tests/text-test.c b/tests/text-test.c index 942cb3b7..9492bd21 100644 --- a/tests/text-test.c +++ b/tests/text-test.c @@ -20,194 +20,169 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include -#include -#include - #include +#include +#include +#include "weston-test-client-helper.h" +#include "../clients/text-client-protocol.h" -#include "test-runner.h" - -struct text_test_data { - struct weston_layer *layer; - - unsigned int expected_activated_count; - unsigned int expected_deactivated_count; - - const char *next_command; - void (*next_handle)(struct test_client *client); +struct text_model_state { + int activated; + int deactivated; }; static void -pre_assert_state(struct test_client *client, - unsigned int expected_activated_count, - unsigned int expected_deactivated_count) +text_model_commit_string(void *data, + struct text_model *text_model, + const char *text, + uint32_t index) { - unsigned int activated_count, deactivated_count; - - assert(sscanf(client->buf, "activated %u deactivated %u", &activated_count, &deactivated_count) == 2); - fprintf(stderr, "Text model activations: %u deactivations: %u\n", activated_count, deactivated_count); - assert(activated_count == expected_activated_count); - assert(deactivated_count == expected_deactivated_count); } static void -handle_assert_state(struct test_client *client) +text_model_preedit_string(void *data, + struct text_model *text_model, + const char *text, + uint32_t index) { - struct text_test_data *data = client->data; - - pre_assert_state(client, data->expected_activated_count, data->expected_deactivated_count); - - test_client_send(client, data->next_command); - client->handle = data->next_handle; } static void -post_assert_state(struct test_client *client, - unsigned int expected_activated_count, - unsigned int expected_deactivated_count, - const char *next_command, - void (*next_handle)(struct test_client *client)) +text_model_delete_surrounding_text(void *data, + struct text_model *text_model, + int32_t index, + uint32_t length) { - struct text_test_data *data = client->data; - - data->expected_activated_count = expected_activated_count; - data->expected_deactivated_count = expected_deactivated_count; - - data->next_command = next_command; - data->next_handle = next_handle; - - test_client_send(client, "assert-state\n"); - client->handle = handle_assert_state; } -static struct weston_seat* -get_seat(struct test_client *client) +static void +text_model_preedit_styling(void *data, + struct text_model *text_model) { - struct wl_list *seat_list; - struct weston_seat *seat; - - seat_list = &client->compositor->seat_list; - assert(wl_list_length(seat_list) == 1); - seat = container_of(seat_list->next, struct weston_seat, link); - - return seat; } static void -handle_surface_unfocus(struct test_client *client) +text_model_modifiers_map(void *data, + struct text_model *text_model, + struct wl_array *map) { - struct weston_seat *seat; - - seat = get_seat(client); - - pre_assert_state(client, 2, 1); - - /* Unfocus the surface */ - wl_keyboard_set_focus(&seat->keyboard, NULL); - - post_assert_state(client, 2, 2, "bye\n", NULL); } static void -handle_reactivate_text_model(struct test_client *client) +text_model_keysym(void *data, + struct text_model *text_model, + uint32_t serial, + uint32_t time, + uint32_t sym, + uint32_t state, + uint32_t modifiers) { - pre_assert_state(client, 1, 1); - - /* text_model is activated */ - - post_assert_state(client, 2, 1, - "assert-state\n", handle_surface_unfocus); } static void -handle_deactivate_text_model(struct test_client *client) +text_model_selection_replacement(void *data, + struct text_model *text_model) { - pre_assert_state(client, 1, 0); - - /* text_model is deactivated */ - - post_assert_state(client, 1, 1, - "activate-text-model\n", handle_reactivate_text_model); } static void -handle_activate_text_model(struct test_client *client) +text_model_direction(void *data, + struct text_model *text_model) { - pre_assert_state(client, 0, 0); - - /* text_model is activated */ +} - post_assert_state(client, 1, 0, - "deactivate-text-model\n", handle_deactivate_text_model); +static void +text_model_locale(void *data, + struct text_model *text_model) +{ } static void -handle_text_model(struct test_client *client) +text_model_enter(void *data, + struct text_model *text_model, + struct wl_surface *surface) + { - uint32_t id; - struct wl_resource *resource; + struct text_model_state *state = data; - assert(sscanf(client->buf, "text_model %u", &id) == 1); - fprintf(stderr, "got text_model id %u\n", id); - resource = wl_client_get_object(client->client, id); - assert(resource); - assert(strcmp(resource->object.interface->name, "text_model") == 0); + fprintf(stderr, "%s\n", __FUNCTION__); - test_client_send(client, "activate-text-model\n"); - client->handle = handle_activate_text_model; + state->activated += 1; } static void -handle_surface(struct test_client *client) +text_model_leave(void *data, + struct text_model *text_model) { - uint32_t id; - struct wl_resource *resource; - struct weston_surface *surface; - struct text_test_data *data = client->data; - struct weston_seat *seat; - - assert(sscanf(client->buf, "surface %u", &id) == 1); - fprintf(stderr, "got surface id %u\n", id); - resource = wl_client_get_object(client->client, id); - assert(resource); - assert(strcmp(resource->object.interface->name, "wl_surface") == 0); - - surface = (struct weston_surface *) resource; - - weston_surface_configure(surface, 100, 100, 200, 200); - weston_surface_update_transform(surface); - weston_surface_set_color(surface, 0.0, 0.0, 0.0, 1.0); - - data->layer = malloc(sizeof *data->layer); - weston_layer_init(data->layer, &client->compositor->cursor_layer.link); - wl_list_insert(&data->layer->surface_list, &surface->layer_link); - weston_surface_damage(surface); - - seat = get_seat(client); - client->compositor->focus = 1; /* Make it work even if pointer is - * outside X window. */ - wl_keyboard_set_focus(&seat->keyboard, &surface->surface); - - test_client_send(client, "create-text-model\n"); - client->handle = handle_text_model; + struct text_model_state *state = data; + + state->deactivated += 1; } +static const struct text_model_listener text_model_listener = { + text_model_commit_string, + text_model_preedit_string, + text_model_delete_surrounding_text, + text_model_preedit_styling, + text_model_modifiers_map, + text_model_keysym, + text_model_selection_replacement, + text_model_direction, + text_model_locale, + text_model_enter, + text_model_leave +}; + TEST(text_test) { - struct test_client *client; - struct text_test_data *data; - - client = test_client_launch(compositor, "test-text-client"); - client->terminate = 1; - - test_client_send(client, "create-surface\n"); - client->handle = handle_surface; - - data = malloc(sizeof *data); - assert(data); - client->data = data; - + struct client *client; + struct global *global; + struct text_model_factory *factory; + struct text_model *text_model; + struct text_model_state state; + + client = client_create(100, 100, 100, 100); + assert(client); + + factory = NULL; + wl_list_for_each(global, &client->global_list, link) { + if (strcmp(global->interface, "text_model_factory") == 0) + factory = wl_registry_bind(client->wl_registry, + global->name, + &text_model_factory_interface, 1); + } + + assert(factory); + + memset(&state, 0, sizeof state); + text_model = text_model_factory_create_text_model(factory); + text_model_add_listener(text_model, &text_model_listener, &state); + + /* Make sure our test surface has keyboard focus. */ + wl_test_activate_surface(client->test->wl_test, + client->surface->wl_surface); + wl_display_roundtrip(client->wl_display); + assert(client->input->keyboard->focus == client->surface); + + /* Activate test model and make sure we get enter event. */ + text_model_activate(text_model, client->input->wl_seat, + client->surface->wl_surface); + wl_display_roundtrip(client->wl_display); + assert(state.activated == 1 && state.deactivated == 0); + + /* Deactivate test model and make sure we get leave event. */ + text_model_deactivate(text_model, client->input->wl_seat); + wl_display_roundtrip(client->wl_display); + assert(state.activated == 1 && state.deactivated == 1); + + /* Activate test model again. */ + text_model_activate(text_model, client->input->wl_seat, + client->surface->wl_surface); + wl_display_roundtrip(client->wl_display); + assert(state.activated == 2 && state.deactivated == 1); + + /* Take keyboard focus away and verify we get leave event. */ + wl_test_activate_surface(client->test->wl_test, NULL); + wl_display_roundtrip(client->wl_display); + assert(state.activated == 2 && state.deactivated == 2); } diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c index 45419fc4..c7ab4e55 100644 --- a/tests/weston-test-client-helper.c +++ b/tests/weston-test-client-helper.c @@ -394,6 +394,15 @@ handle_global(void *data, struct wl_registry *registry, struct input *input; struct output *output; struct test *test; + struct global *global; + + global = malloc(sizeof *global); + assert(global); + global->name = id; + global->interface = strdup(interface); + assert(interface); + global->version = version; + wl_list_insert(client->global_list.prev, &global->link); if (strcmp(interface, "wl_compositor") == 0) { client->wl_compositor = @@ -443,6 +452,7 @@ client_create(int x, int y, int width, int height) client = calloc(1, sizeof *client); client->wl_display = wl_display_connect(NULL); assert(client->wl_display); + wl_list_init(&client->global_list); /* setup registry so we can bind to interfaces */ client->wl_registry = wl_display_get_registry(client->wl_display); diff --git a/tests/weston-test-client-helper.h b/tests/weston-test-client-helper.h index 3e648ae6..e84d3b27 100644 --- a/tests/weston-test-client-helper.h +++ b/tests/weston-test-client-helper.h @@ -37,6 +37,14 @@ struct client { struct output *output; struct surface *surface; int has_argb; + struct wl_list global_list; +}; + +struct global { + uint32_t name; + char *interface; + uint32_t version; + struct wl_list link; }; struct test {