From: "U. Artie Eoff" <ullysses.a.e...@intel.com>
Signed-off-by: U. Artie Eoff <ullysses.a.e...@intel.com>
---
tests/.gitignore | 1 +
tests/Makefile.am | 31 +++++++++--
tests/keyboard-test.c | 139 +++++++++++++++-----------------------------------
3 files changed, 68 insertions(+), 103 deletions(-)
diff --git a/tests/.gitignore b/tests/.gitignore
index 26bf83d..ffc8b9d 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -5,3 +5,4 @@ test-text-client
wayland-test-client-protocol.h
wayland-test-protocol.c
wayland-test-server-protocol.h
+keyboard-test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3cceef2..5f5dcf5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,12 @@
-TESTS = surface-test.la client-test.la \
+TESTS = $(module_tests) $(weston_tests)
+
+module_tests = surface-test.la client-test.la \
event-test.la text-test.la \
surface-global-test.la \
- button-test.la keyboard-test.la
+ button-test.la
+
+weston_tests = \
+ keyboard-test
TESTS_ENVIRONMENT = $(PYTHON) $(top_srcdir)/tests/weston-tests-env
@@ -15,11 +20,12 @@ noinst_PROGRAMS = \
matrix-test
check_LTLIBRARIES = \
- $(TESTS)
+ $(module_tests)
check_PROGRAMS = \
test-client \
- test-text-client
+ test-text-client \
+ $(weston_tests)
AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src -DUNIT_TEST $(COMPOSITOR_CFLAGS)
@@ -33,7 +39,6 @@ client_test_la_SOURCES = client-test.c $(test_runner_src)
event_test_la_SOURCES = event-test.c $(test_runner_src)
text_test_la_SOURCES = text-test.c $(test_runner_src)
button_test_la_SOURCES = button-test.c $(test_runner_src)
-keyboard_test_la_SOURCES = keyboard-test.c $(test_runner_src)
test_client_SOURCES = test-client.c
test_client_LDADD = $(SIMPLE_CLIENT_LIBS)
@@ -50,6 +55,22 @@ weston_test_la_SOURCES = \
wayland-test-protocol.c \
wayland-test-server-protocol.h
+weston_test_runner_src = \
+ weston-test-runner.c \
+ weston-test-runner.h
+weston_test_client_src = \
+ weston-test-client-helper.c \
+ weston-test-client-helper.h \
+ wayland-test-protocol.c \
+ wayland-test-client-protocol.h \
+ $(weston_test_runner_src)
+weston_test_client_libs = \
+ $(SIMPLE_CLIENT_LIBS) \
+ ../shared/libshared.la
+
+keyboard_test_SOURCES = keyboard-test.c $(weston_test_client_src)
+keyboard_test_LDADD = $(weston_test_client_libs)
+
matrix_test_SOURCES = \
matrix-test.c \
$(top_srcdir)/src/matrix.c \
diff --git a/tests/keyboard-test.c b/tests/keyboard-test.c
index ef450b5..353dde2 100644
--- a/tests/keyboard-test.c
+++ b/tests/keyboard-test.c
@@ -20,105 +20,48 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/socket.h>
-#include <assert.h>
-#include <unistd.h>
-#include <string.h>
+#include "weston-test-client-helper.h"
-#include "test-runner.h"
-
-struct context {
- struct weston_seat *seat;
- struct weston_surface *surface;
- uint32_t expect_key;
- uint32_t expect_key_state;
- int expect_focus;
-};
-
-static void
-handle_keyboard_state(struct test_client *client)
+TEST(simple_keyboard_test)
{
- struct context *context = client->data;
- uint32_t key, key_state;
- int focus;
-
- assert(sscanf(client->buf, "%u %u %d", &key, &key_state, &focus));
-
- assert(key == context->expect_key);
- assert(key_state == context->expect_key_state);
- assert(focus == context->expect_focus);
-
- if (key_state == WL_KEYBOARD_KEY_STATE_PRESSED) {
- context->expect_key_state = WL_KEYBOARD_KEY_STATE_RELEASED;
- notify_key(context->seat, 100, context->expect_key,
- context->expect_key_state,
- STATE_UPDATE_AUTOMATIC);
- } else if (focus) {
- context->expect_focus = 0;
- notify_keyboard_focus_out(context->seat);
- } else if (context->expect_key < 10) {
- context->expect_key++;
- context->expect_focus = 1;
- context->expect_key_state = WL_KEYBOARD_KEY_STATE_PRESSED;
- notify_keyboard_focus_in(context->seat,
- &context->seat->keyboard.keys,
- STATE_UPDATE_AUTOMATIC);
- notify_key(context->seat, 100, context->expect_key,
- context->expect_key_state,
- STATE_UPDATE_AUTOMATIC);
- } else {
- test_client_send(client, "bye\n");
- return;
+ struct client *client;
+ struct surface *expect_focus = NULL;
+ struct keyboard *keyboard;
+ uint32_t expect_key = 0;
+ uint32_t expect_state = 0;
+
+ client = client_create(10, 10, 1, 1);
+ assert(client);
+
+ keyboard = client->input->keyboard;
+
+ while(1) {
+ assert(keyboard->key == expect_key);
+ assert(keyboard->state == expect_state);
+ assert(keyboard->focus == expect_focus);
+
+ if (keyboard->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
+ expect_state = WL_KEYBOARD_KEY_STATE_RELEASED;
+ wl_test_send_key(client->test->wl_test, expect_key,
+ expect_state);
+ yield(client);
+ } else if (keyboard->focus) {
+ expect_focus = NULL;
+ wl_test_activate_surface(client->test->wl_test,
+ NULL);
+ yield(client);
+ } else if (expect_key < 10) {
+ expect_key++;
+ expect_focus = client->surface;
+ expect_state = WL_KEYBOARD_KEY_STATE_PRESSED;
+ wl_test_activate_surface(client->test->wl_test,
+ expect_focus->wl_surface);
+ yield(client);
+ wl_test_send_key(client->test->wl_test, expect_key,
+ expect_state);
+ yield(client);
+ } else {
+ break;
+ }
}
-
- test_client_send(client, "send-keyboard-state\n");
-}
-
-static void
-handle_surface(struct test_client *client)
-{
- uint32_t id;
- struct context *context = client->data;
- struct wl_resource *resource;
- struct wl_list *seat_list;
-
- assert(sscanf(client->buf, "surface %u", &id) == 1);
- fprintf(stderr, "server: 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);
-
- context->surface = (struct weston_surface *) resource;
- weston_surface_set_color(context->surface, 0.0, 0.0, 0.0, 1.0);
- weston_surface_configure(context->surface, 100, 100, 100, 100);
- weston_surface_update_transform(context->surface);
- weston_surface_damage(context->surface);
-
- seat_list = &client->compositor->seat_list;
- assert(wl_list_length(seat_list) == 1);
- context->seat = container_of(seat_list->next, struct weston_seat, link);
-
- context->seat->keyboard.focus = context->surface;
- notify_keyboard_focus_out(context->seat);
-
- test_client_send(client, "send-keyboard-state\n");
- client->handle = handle_keyboard_state;
-}
-
-TEST(keyboard_test)
-{
- struct context *context;
- struct test_client *client;
-
- client = test_client_launch(compositor, "test-client");
- client->terminate = 1;
-
- test_client_send(client, "create-surface\n");
- client->handle = handle_surface;
-
- context = calloc(1, sizeof *context);
- assert(context);
- client->data = context;
}
--
1.7.11.7
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
