X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-array_list.c;h=5a9dbbd2cc822099d1270e8ad26a65d90348f6cb;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=7dc66b5590b06514aa493a7576afb90a70dc8708;hpb=c0fea97ccf33a4e6b6f9116216b1634663f29474;p=gnulib.git diff --git a/tests/test-array_list.c b/tests/test-array_list.c index 7dc66b559..5a9dbbd2c 100644 --- a/tests/test-array_list.c +++ b/tests/test-array_list.c @@ -1,11 +1,11 @@ /* Test of sequential list data type implementation. - Copyright (C) 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2007. - 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,34 +13,22 @@ 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 . */ #include #include "gl_array_list.h" -#include #include #include "progname.h" +#include "macros.h" 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(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - abort (); \ - } \ - } \ - while (0) #define RANDOM(n) (rand () % (n)) #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] @@ -79,12 +67,14 @@ main (int argc, char *argv[]) contents[i] = RANDOM_OBJECT (); /* Create list1. */ - list1 = gl_list_create (GL_ARRAY_LIST, NULL, 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_ARRAY_LIST, NULL, NULL, NULL, true); + list2 = gl_list_nx_create_empty (GL_ARRAY_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); check_equals (list1, list2); @@ -100,11 +90,13 @@ main (int argc, char *argv[]) const char *obj = RANDOM_OBJECT (); gl_list_node_t node1, node2; - 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); @@ -161,8 +153,10 @@ main (int argc, char *argv[]) { const char *obj = RANDOM_OBJECT (); gl_list_node_t node1, node2; - node1 = gl_list_add_first (list1, obj); - node2 = gl_list_add_first (list2, obj); + node1 = gl_list_nx_add_first (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_first (list2, obj); + ASSERT (node2 != NULL); ASSERT (gl_list_node_value (list1, node1) == obj); ASSERT (gl_list_node_value (list2, node2) == obj); ASSERT (gl_list_get_at (list1, 0) == obj); @@ -173,8 +167,10 @@ main (int argc, char *argv[]) { const char *obj = RANDOM_OBJECT (); gl_list_node_t node1, node2; - node1 = gl_list_add_last (list1, obj); - node2 = gl_list_add_last (list2, obj); + node1 = gl_list_nx_add_last (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_last (list2, obj); + ASSERT (node2 != NULL); ASSERT (gl_list_node_value (list1, node1) == obj); ASSERT (gl_list_node_value (list2, node2) == obj); ASSERT (gl_list_get_at (list1, gl_list_size (list1) - 1) == obj); @@ -187,12 +183,18 @@ main (int argc, char *argv[]) const char *obj1 = RANDOM_OBJECT (); const char *obj2 = RANDOM_OBJECT (); gl_list_node_t node1, node2; - 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); + 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); ASSERT (gl_list_node_value (list1, node1) == obj1); ASSERT (gl_list_node_value (list2, node2) == obj1); ASSERT (gl_list_get_at (list1, 0) == obj0); @@ -208,8 +210,10 @@ 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; - node1 = gl_list_add_at (list1, index, obj); - node2 = gl_list_add_at (list2, 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); ASSERT (gl_list_get_at (list1, index) == obj); ASSERT (gl_list_node_value (list1, node1) == obj); ASSERT (gl_list_get_at (list2, index) == obj);