projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto/gc-des: Fix recent regression.
[gnulib.git]
/
tests
/
test-array_oset.c
diff --git
a/tests/test-array_oset.c
b/tests/test-array_oset.c
index
646e908
..
2d069d6
100644
(file)
--- a/
tests/test-array_oset.c
+++ b/
tests/test-array_oset.c
@@
-1,11
+1,11
@@
/* Test of ordered set data type implementation.
/* Test of ordered set data type implementation.
- Copyright (C) 2006-20
07
Free Software Foundation, Inc.
+ Copyright (C) 2006-20
11
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2007.
Written by Bruno Haible <bruno@clisp.org>, 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,20
+13,19
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "gl_array_oset.h"
#include <stdlib.h>
#include <string.h>
#include "gl_array_oset.h"
#include <stdlib.h>
#include <string.h>
+#include "gl_xlist.h"
#include "gl_array_list.h"
#include "progname.h"
#include "gl_array_list.h"
#include "progname.h"
+#include "macros.h"
static const char *objects[30] =
{
static const char *objects[30] =
{
@@
-34,8
+33,6
@@
static const char *objects[30] =
"p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
};
"p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
};
-#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))]
#define RANDOM(n) (rand () % (n))
#define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
@@
-88,7
+85,8
@@
main (int argc, char *argv[])
unsigned int repeat;
/* Create set1. */
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_list_create_empty (GL_ARRAY_LIST, NULL, NULL, NULL, false);
/* Create set2. */
set2 = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL, NULL, false);
@@
-99,10
+97,10
@@
main (int argc, char *argv[])
for (i = 0; i < initial_size; i++)
{
const char *obj = RANDOM_OBJECT ();
for (i = 0; i < initial_size; i++)
{
const char *obj = RANDOM_OBJECT ();
- ASSERT (gl_oset_add (set1, obj)
- == (gl_sortedlist_search (set2, (gl_listelement_compar_fn)strcmp, obj) != NULL
- ? false
- : (gl_sortedlist_add (set2, (gl_listelement_compar_fn)strcmp, obj), true)));
+ ASSERT (gl_oset_
nx_
add (set1, obj)
+
== (gl_sortedlist_search (set2, (gl_listelement_compar_fn)strcmp, obj) != NULL
+
? false
+
: (gl_sortedlist_add (set2, (gl_listelement_compar_fn)strcmp, obj), true)));
check_all (set1, set2);
}
check_all (set1, set2);
}
@@
-115,23
+113,23
@@
main (int argc, char *argv[])
{
const char *obj = RANDOM_OBJECT ();
ASSERT (gl_oset_search (set1, obj)
{
const char *obj = RANDOM_OBJECT ();
ASSERT (gl_oset_search (set1, obj)
- == (gl_sortedlist_search (set2, (gl_listelement_compar_fn)strcmp, obj) != NULL));
+
== (gl_sortedlist_search (set2, (gl_listelement_compar_fn)strcmp, obj) != NULL));
}
break;
case 1:
{
const char *obj = RANDOM_OBJECT ();
}
break;
case 1:
{
const char *obj = RANDOM_OBJECT ();
- ASSERT (gl_oset_add (set1, obj)
- == (gl_sortedlist_search (set2, (gl_listelement_compar_fn)strcmp, obj) != NULL
- ? false
- : (gl_sortedlist_add (set2, (gl_listelement_compar_fn)strcmp, obj), true)));
+ ASSERT (gl_oset_
nx_
add (set1, obj)
+
== (gl_sortedlist_search (set2, (gl_listelement_compar_fn)strcmp, obj) != NULL
+
? false
+
: (gl_sortedlist_add (set2, (gl_listelement_compar_fn)strcmp, obj), true)));
}
break;
case 2:
{
const char *obj = RANDOM_OBJECT ();
ASSERT (gl_oset_remove (set1, obj)
}
break;
case 2:
{
const char *obj = RANDOM_OBJECT ();
ASSERT (gl_oset_remove (set1, obj)
- == gl_sortedlist_remove (set2, (gl_listelement_compar_fn)strcmp, obj));
+
== gl_sortedlist_remove (set2, (gl_listelement_compar_fn)strcmp, obj));
}
break;
}
}
break;
}