Re: [PATCH] tests: add keyboard test
On Mon, Oct 01, 2012 at 03:21:16PM -0700, U. Artie Eoff wrote:
> From: "U. Artie Eoff"
Thanks Artie, this one and the previous three tests all committed. I
really appreciate the work, it's good to see the test suite become
more useful.
Kristian
> Signed-off-by: U. Artie Eoff
> ---
> tests/Makefile.am | 3 +-
> tests/keyboard-test.c | 124
> ++
> tests/test-client.c | 32 -
> 3 files changed, 157 insertions(+), 2 deletions(-)
> create mode 100644 tests/keyboard-test.c
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index fcf6674..944879f 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -1,7 +1,7 @@
> TESTS = surface-test.la client-test.la \
> event-test.la text-test.la \
> surface-global-test.la \
> - button-test.la
> + button-test.la keyboard-test.la
>
> TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-test
>
> @@ -24,6 +24,7 @@ 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)
> diff --git a/tests/keyboard-test.c b/tests/keyboard-test.c
> new file mode 100644
> index 000..ef450b5
> --- /dev/null
> +++ b/tests/keyboard-test.c
> @@ -0,0 +1,124 @@
> +/*
> + * 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 "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)
> +{
> + 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;
> + }
> +
> + 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
[PATCH] tests: add keyboard test
From: "U. Artie Eoff"
Signed-off-by: U. Artie Eoff
---
tests/Makefile.am | 3 +-
tests/keyboard-test.c | 124 ++
tests/test-client.c | 32 -
3 files changed, 157 insertions(+), 2 deletions(-)
create mode 100644 tests/keyboard-test.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fcf6674..944879f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
TESTS = surface-test.la client-test.la \
event-test.la text-test.la \
surface-global-test.la \
- button-test.la
+ button-test.la keyboard-test.la
TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-test
@@ -24,6 +24,7 @@ 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)
diff --git a/tests/keyboard-test.c b/tests/keyboard-test.c
new file mode 100644
index 000..ef450b5
--- /dev/null
+++ b/tests/keyboard-test.c
@@ -0,0 +1,124 @@
+/*
+ * 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 "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)
+{
+ 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;
+ }
+
+ 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_
