X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-rbtree_list.c;h=b3207cebecd9040021037bd4a4eff59a572cfe4b;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=d07e9e46fa2eefa3442ec5210a438634c3413b51;hpb=79cb3c5d3d6db747bc4dcbfe88b5de708d2dbab5;p=gnulib.git diff --git a/tests/test-rbtree_list.c b/tests/test-rbtree_list.c index d07e9e46f..b3207cebe 100644 --- a/tests/test-rbtree_list.c +++ b/tests/test-rbtree_list.c @@ -1,11 +1,11 @@ /* Test of sequential list data type implementation. - Copyright (C) 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2006-2013 Free Software Foundation, Inc. Written by Bruno Haible , 2006. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,12 +13,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "gl_rbtree_list.h" @@ -26,6 +23,7 @@ #include "gl_array_list.h" #include "progname.h" +#include "macros.h" extern void gl_rbtree_list_check_invariants (gl_list_t list); @@ -34,8 +32,6 @@ static const char *objects[15] = "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o" }; -#define SIZEOF(array) (sizeof (array) / sizeof (array[0])) -#define ASSERT(condition) if (!(condition)) abort () #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] @@ -83,16 +79,19 @@ main (int argc, char *argv[]) contents[i] = RANDOM_OBJECT (); /* Create list1. */ - list1 = gl_list_create (GL_ARRAY_LIST, NULL, NULL, true, - initial_size, contents); + list1 = gl_list_nx_create (GL_ARRAY_LIST, NULL, NULL, NULL, true, + initial_size, contents); + ASSERT (list1 != NULL); /* Create list2. */ - list2 = gl_list_create_empty (GL_RBTREE_LIST, NULL, NULL, true); + list2 = gl_list_nx_create_empty (GL_RBTREE_LIST, NULL, NULL, NULL, true); + ASSERT (list2 != NULL); for (i = 0; i < initial_size; i++) - gl_list_add_last (list2, contents[i]); + ASSERT (gl_list_nx_add_last (list2, contents[i]) != NULL); /* Create list3. */ - list3 = gl_list_create (GL_RBTREE_LIST, NULL, NULL, true, - initial_size, contents); + list3 = gl_list_nx_create (GL_RBTREE_LIST, NULL, NULL, NULL, true, + initial_size, contents); + ASSERT (list3 != NULL); check_all (list1, list2, list3); @@ -108,15 +107,18 @@ main (int argc, char *argv[]) const char *obj = RANDOM_OBJECT (); gl_list_node_t node1, node2, node3; - node1 = gl_list_set_at (list1, index, obj); + node1 = gl_list_nx_set_at (list1, index, obj); + ASSERT (node1 != NULL); ASSERT (gl_list_get_at (list1, index) == obj); ASSERT (gl_list_node_value (list1, node1) == obj); - node2 = gl_list_set_at (list2, index, obj); + node2 = gl_list_nx_set_at (list2, index, obj); + ASSERT (node2 != NULL); ASSERT (gl_list_get_at (list2, index) == obj); ASSERT (gl_list_node_value (list2, node2) == obj); - node3 = gl_list_set_at (list3, index, obj); + node3 = gl_list_nx_set_at (list3, index, obj); + ASSERT (node3 != NULL); ASSERT (gl_list_get_at (list3, index) == obj); ASSERT (gl_list_node_value (list3, node3) == obj); @@ -190,9 +192,12 @@ main (int argc, char *argv[]) { const char *obj = RANDOM_OBJECT (); gl_list_node_t node1, node2, node3; - node1 = gl_list_add_first (list1, obj); - node2 = gl_list_add_first (list2, obj); - node3 = gl_list_add_first (list3, obj); + node1 = gl_list_nx_add_first (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_first (list2, obj); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_first (list3, obj); + ASSERT (node3 != NULL); ASSERT (gl_list_node_value (list1, node1) == obj); ASSERT (gl_list_node_value (list2, node2) == obj); ASSERT (gl_list_node_value (list3, node3) == obj); @@ -205,9 +210,12 @@ main (int argc, char *argv[]) { const char *obj = RANDOM_OBJECT (); gl_list_node_t node1, node2, node3; - node1 = gl_list_add_last (list1, obj); - node2 = gl_list_add_last (list2, obj); - node3 = gl_list_add_last (list3, obj); + node1 = gl_list_nx_add_last (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_last (list2, obj); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_last (list3, obj); + ASSERT (node3 != NULL); ASSERT (gl_list_node_value (list1, node1) == obj); ASSERT (gl_list_node_value (list2, node2) == obj); ASSERT (gl_list_node_value (list3, node3) == obj); @@ -222,15 +230,24 @@ main (int argc, char *argv[]) const char *obj1 = RANDOM_OBJECT (); const char *obj2 = RANDOM_OBJECT (); gl_list_node_t node1, node2, node3; - node1 = gl_list_add_first (list1, obj2); - node1 = gl_list_add_before (list1, node1, obj0); - node1 = gl_list_add_after (list1, node1, obj1); - node2 = gl_list_add_first (list2, obj2); - node2 = gl_list_add_before (list2, node2, obj0); - node2 = gl_list_add_after (list2, node2, obj1); - node3 = gl_list_add_first (list3, obj2); - node3 = gl_list_add_before (list3, node3, obj0); - node3 = gl_list_add_after (list3, node3, obj1); + node1 = gl_list_nx_add_first (list1, obj2); + ASSERT (node1 != NULL); + node1 = gl_list_nx_add_before (list1, node1, obj0); + ASSERT (node1 != NULL); + node1 = gl_list_nx_add_after (list1, node1, obj1); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_first (list2, obj2); + ASSERT (node2 != NULL); + node2 = gl_list_nx_add_before (list2, node2, obj0); + ASSERT (node2 != NULL); + node2 = gl_list_nx_add_after (list2, node2, obj1); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_first (list3, obj2); + ASSERT (node3 != NULL); + node3 = gl_list_nx_add_before (list3, node3, obj0); + ASSERT (node3 != NULL); + node3 = gl_list_nx_add_after (list3, node3, obj1); + ASSERT (node3 != NULL); ASSERT (gl_list_node_value (list1, node1) == obj1); ASSERT (gl_list_node_value (list2, node2) == obj1); ASSERT (gl_list_node_value (list3, node3) == obj1); @@ -250,9 +267,12 @@ main (int argc, char *argv[]) size_t index = RANDOM (gl_list_size (list1) + 1); const char *obj = RANDOM_OBJECT (); gl_list_node_t node1, node2, node3; - node1 = gl_list_add_at (list1, index, obj); - node2 = gl_list_add_at (list2, index, obj); - node3 = gl_list_add_at (list3, index, obj); + node1 = gl_list_nx_add_at (list1, index, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_at (list2, index, obj); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_at (list3, index, obj); + ASSERT (node3 != NULL); ASSERT (gl_list_get_at (list1, index) == obj); ASSERT (gl_list_node_value (list1, node1) == obj); ASSERT (gl_list_get_at (list2, index) == obj);