svn merge ^/branches/released .

2 files changed, 178 insertions, 1 deletions

diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index 8bb3a0688..d93c7a223 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -1,6 +1,6 @@
 if UNITTESTS

 SUBDIRS= . xi2

-check_PROGRAMS = xkb input xtest

+check_PROGRAMS = xkb input xtest list

 check_LTLIBRARIES = libxservertest.la

 

 TESTS=$(check_PROGRAMS)

@@ -16,6 +16,7 @@ endif
 xkb_LDADD=$(TEST_LDADD)

 input_LDADD=$(TEST_LDADD)

 xtest_LDADD=$(TEST_LDADD)

+list_LDADD=$(TEST_LDADD)

 

 libxservertest_la_LIBADD = \

             $(XSERVER_LIBS) \

diff --git a/xorg-server/test/list.c b/xorg-server/test/list.c
new file mode 100644
index 000000000..7e035fe58
--- /dev/null
+++ b/xorg-server/test/list.c
@@ -0,0 +1,176 @@
+/**

+ * Copyright © 2011 Red Hat, Inc.

+ *

+ *  Permission is hereby granted, free of charge, to any person obtaining a

+ *  copy of this software and associated documentation files (the "Software"),

+ *  to deal in the Software without restriction, including without limitation

+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ *  and/or sell copies of the Software, and to permit persons to whom the

+ *  Software is furnished to do so, subject to the following conditions:

+ *

+ *  The above copyright notice and this permission notice (including the next

+ *  paragraph) shall be included in all copies or substantial portions of the

+ *  Software.

+ *

+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ *  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ *  DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <X11/Xlib.h>

+#include <list.h>

+#include <string.h>

+#include <glib.h>

+

+struct parent {

+    int a;

+    struct list children;

+    int b;

+};

+

+struct child {

+    int foo;

+    int bar;

+    struct list node;

+};

+

+static void

+test_list_init(void)

+{

+    struct parent parent, tmp;

+

+    memset(&parent, 0, sizeof(parent));

+    parent.a = 0xa5a5a5;

+    parent.b = ~0xa5a5a5;

+

+    tmp = parent;

+

+    list_init(&parent.children);

+

+    /* test we haven't touched anything else. */

+    g_assert(parent.a == tmp.a);

+    g_assert(parent.b == tmp.b);

+

+    g_assert(list_is_empty(&parent.children));

+}

+

+static void

+test_list_add(void)

+{

+    struct parent parent = {0};

+    struct child child[3];

+    struct child *c;

+

+    list_init(&parent.children);

+

+    list_add(&child[0].node, &parent.children);

+    g_assert(!list_is_empty(&parent.children));

+

+    c = list_first_entry(&parent.children, struct child, node);

+    g_assert(memcmp(c, &child[0], sizeof(struct child)) == 0);

+

+    /* note: list_add prepends */

+    list_add(&child[1].node, &parent.children);

+    c = list_first_entry(&parent.children, struct child, node);

+    g_assert(memcmp(c, &child[1], sizeof(struct child)) == 0);

+

+    list_add(&child[2].node, &parent.children);

+    c = list_first_entry(&parent.children, struct child, node);

+    g_assert(memcmp(c, &child[2], sizeof(struct child)) == 0);

+};

+

+static void

+test_list_del(void)

+{

+    struct parent parent = {0};

+    struct child child[3];

+    struct child *c;

+

+    list_init(&parent.children);

+

+    list_add(&child[0].node, &parent.children);

+    g_assert(!list_is_empty(&parent.children));

+

+    list_del(&parent.children);

+    g_assert(list_is_empty(&parent.children));

+

+    list_add(&child[0].node, &parent.children);

+    list_del(&child[0].node);

+    g_assert(list_is_empty(&parent.children));

+

+    list_add(&child[0].node, &parent.children);

+    list_add(&child[1].node, &parent.children);

+

+    c = list_first_entry(&parent.children, struct child, node);

+    g_assert(memcmp(c, &child[1], sizeof(struct child)) == 0);

+

+    /* delete first node */

+    list_del(&child[1].node);

+    g_assert(!list_is_empty(&parent.children));

+    g_assert(list_is_empty(&child[1].node));

+    c = list_first_entry(&parent.children, struct child, node);

+    g_assert(memcmp(c, &child[0], sizeof(struct child)) == 0);

+

+    /* delete last node */

+    list_add(&child[1].node, &parent.children);

+    list_del(&child[0].node);

+    c = list_first_entry(&parent.children, struct child, node);

+    g_assert(memcmp(c, &child[1], sizeof(struct child)) == 0);

+

+    /* delete list head */

+    list_add(&child[0].node, &parent.children);

+    list_del(&parent.children);

+    g_assert(list_is_empty(&parent.children));

+    g_assert(!list_is_empty(&child[1].node));

+    g_assert(!list_is_empty(&child[2].node));

+}

+

+static void

+test_list_for_each(void)

+{

+    struct parent parent = {0};

+    struct child child[3];

+    struct child *c;

+    int i = 0;

+

+    list_init(&parent.children);

+

+    list_add(&child[2].node, &parent.children);

+    list_add(&child[1].node, &parent.children);

+    list_add(&child[0].node, &parent.children);

+

+    list_for_each_entry(c, &parent.children, node) {

+        g_assert(memcmp(c, &child[i], sizeof(struct child)) == 0);

+        i++;

+    }

+

+    /* foreach on empty list */

+    list_del(&parent.children);

+    g_assert(list_is_empty(&parent.children));

+

+    list_for_each_entry(c, &parent.children, node) {

+        g_assert(0); /* we must not get here */

+    }

+}

+

+

+int main(int argc, char** argv)

+{

+    g_test_init(&argc, &argv,NULL);

+    g_test_bug_base("https://bugzilla.freedesktop.org/show_bug.cgi?id=");

+

+    g_test_add_func("/list/init", test_list_init);

+    g_test_add_func("/list/add", test_list_add);

+    g_test_add_func("/list/del", test_list_del);

+    g_test_add_func("/list/for_each", test_list_for_each);

+

+    return g_test_run();

+}