X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-avltree_oset.c;h=084b6295430b61a2c1422d387128e61b240b6fd0;hb=refs%2Ftags%2Fstable%2F20110908;hp=bdcaadc933f74d74eb360e14d3f3f545c16aea57;hpb=c0fea97ccf33a4e6b6f9116216b1634663f29474;p=gnulib.git

diff --git a/tests/test-avltree_oset.c b/tests/test-avltree_oset.c
index bdcaadc93..084b62954 100644
--- a/tests/test-avltree_oset.c
+++ b/tests/test-avltree_oset.c
@@ -1,11 +1,11 @@
 /* Test of ordered set data type implementation.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 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,19 +13,18 @@
    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 <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 #include "gl_avltree_oset.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_oset.h"
 #include "progname.h"
+#include "macros.h"
 
 extern void gl_avltree_oset_check_invariants (gl_oset_t set);
 
@@ -35,17 +34,6 @@ static const char *objects[30] =
     "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
   };
 
-#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))]
 
@@ -84,6 +72,8 @@ main (int argc, char *argv[])
 {
   gl_oset_t set1, set2;
 
+  set_program_name (argv[0]);
+
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));
@@ -94,10 +84,12 @@ main (int argc, char *argv[])
     unsigned int repeat;
 
     /* Create set1.  */
-    set1 = gl_oset_create_empty (GL_ARRAY_OSET, (gl_setelement_compar_fn) strcmp, NULL);
+    set1 = gl_oset_nx_create_empty (GL_ARRAY_OSET, (gl_setelement_compar_fn) strcmp, NULL);
+    ASSERT (set1 != NULL);
 
     /* Create set2.  */
-    set2 = gl_oset_create_empty (GL_AVLTREE_OSET, (gl_setelement_compar_fn) strcmp, NULL);
+    set2 = gl_oset_nx_create_empty (GL_AVLTREE_OSET, (gl_setelement_compar_fn) strcmp, NULL);
+    ASSERT (set2 != NULL);
 
     check_all (set1, set2);
 
@@ -105,7 +97,7 @@ main (int argc, char *argv[])
     for (i = 0; i < initial_size; i++)
       {
         const char *obj = RANDOM_OBJECT ();
-        ASSERT (gl_oset_add (set1, obj) == gl_oset_add (set2, obj));
+        ASSERT (gl_oset_nx_add (set1, obj) == gl_oset_nx_add (set2, obj));
         check_all (set1, set2);
       }
 
@@ -123,7 +115,7 @@ main (int argc, char *argv[])
           case 1:
             {
               const char *obj = RANDOM_OBJECT ();
-              ASSERT (gl_oset_add (set1, obj) == gl_oset_add (set2, obj));
+              ASSERT (gl_oset_nx_add (set1, obj) == gl_oset_nx_add (set2, obj));
             }
             break;
           case 2: