External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: hash: Prepare for replacement of virHashCreate

Browse Source 
Most callers pass a random number. We have virHashNew which doesn't give
the callers the option to configure the table. Since we are going to
switch to virHashNew replace it in tests and remove multiple instances
of the 'testHashGrow' case as it doesn't make sense with the new
semantics.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2020-10-21 09:41:50 +02:00
parent e12324d2af
commit afc4139136
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/virhashtest.c
View File

@ -15,12 +15,12 @@
VIR_LOG_INIT("tests.hashtest"); VIR_LOG_INIT("tests.hashtest");
static virHashTablePtr static virHashTablePtr
testHashInit(int size) testHashInit(void)
{ {
virHashTablePtr hash; virHashTablePtr hash;
ssize_t i; ssize_t i;
if (!(hash = virHashCreate(size, NULL))) if (!(hash = virHashNew(NULL)))
return NULL; return NULL;
/* entries are added in reverse order so that they will be linked in /* entries are added in reverse order so that they will be linked in
@ -83,13 +83,12 @@ struct testInfo {
static int static int
testHashGrow(const void *data) testHashGrow(const void *data G_GNUC_UNUSED)
{ {
const struct testInfo *info = data;
virHashTablePtr hash; virHashTablePtr hash;
int ret = -1; int ret = -1;
if (!(hash = testHashInit(info->count))) if (!(hash = testHashInit()))
return -1; return -1;
if (testHashCheckCount(hash, G_N_ELEMENTS(uuids)) < 0) if (testHashCheckCount(hash, G_N_ELEMENTS(uuids)) < 0)
@ -111,7 +110,7 @@ testHashUpdate(const void *data G_GNUC_UNUSED)
size_t i; size_t i;
int ret = -1; int ret = -1;
if (!(hash = testHashInit(0))) if (!(hash = testHashInit()))
return -1; return -1;
for (i = 0; i < G_N_ELEMENTS(uuids_subset); i++) { for (i = 0; i < G_N_ELEMENTS(uuids_subset); i++) {
@ -149,7 +148,7 @@ testHashRemove(const void *data G_GNUC_UNUSED)
size_t i; size_t i;
int ret = -1; int ret = -1;
if (!(hash = testHashInit(0))) if (!(hash = testHashInit()))
return -1; return -1;
for (i = 0; i < G_N_ELEMENTS(uuids_subset); i++) { for (i = 0; i < G_N_ELEMENTS(uuids_subset); i++) {
@ -216,7 +215,7 @@ testHashRemoveForEach(const void *data)
virHashTablePtr hash; virHashTablePtr hash;
int ret = -1; int ret = -1;
if (!(hash = testHashInit(0))) if (!(hash = testHashInit()))
return -1; return -1;
if (virHashForEach(hash, (virHashIterator) info->data, hash)) { if (virHashForEach(hash, (virHashIterator) info->data, hash)) {
@ -243,7 +242,7 @@ testHashSteal(const void *data G_GNUC_UNUSED)
size_t i; size_t i;
int ret = -1; int ret = -1;
if (!(hash = testHashInit(0))) if (!(hash = testHashInit()))
return -1; return -1;
for (i = 0; i < G_N_ELEMENTS(uuids_subset); i++) { for (i = 0; i < G_N_ELEMENTS(uuids_subset); i++) {
@ -297,7 +296,7 @@ testHashRemoveSet(const void *data G_GNUC_UNUSED)
int rcount; int rcount;
int ret = -1; int ret = -1;
if (!(hash = testHashInit(0))) if (!(hash = testHashInit()))
return -1; return -1;
/* seed the generator so that rand() provides reproducible sequence */ /* seed the generator so that rand() provides reproducible sequence */
@ -340,7 +339,7 @@ testHashSearch(const void *data G_GNUC_UNUSED)
void *entry; void *entry;
int ret = -1; int ret = -1;
if (!(hash = testHashInit(0))) if (!(hash = testHashInit()))
return -1; return -1;
entry = virHashSearch(hash, testHashSearchIter, NULL, NULL); entry = virHashSearch(hash, testHashSearchIter, NULL, NULL);
@ -544,15 +543,10 @@ mymain(void)
testHash ## cmd ## data, \ testHash ## cmd ## data, \
testHashCount ## cmd ## data) testHashCount ## cmd ## data)
#define DO_TEST_COUNT(name, cmd, count) \
DO_TEST_FULL(name "(" #count ")", cmd, NULL, count)
#define DO_TEST(name, cmd) \ #define DO_TEST(name, cmd) \
DO_TEST_FULL(name, cmd, NULL, -1) DO_TEST_FULL(name, cmd, NULL, -1)
DO_TEST_COUNT("Grow", Grow, 1); DO_TEST("Grow", Grow);
DO_TEST_COUNT("Grow", Grow, 10);
DO_TEST_COUNT("Grow", Grow, 42);
DO_TEST("Update", Update); DO_TEST("Update", Update);
DO_TEST("Remove", Remove); DO_TEST("Remove", Remove);
DO_TEST_DATA("Remove in ForEach", RemoveForEach, Some); DO_TEST_DATA("Remove in ForEach", RemoveForEach, Some);