[PATCH v2 5/7] virbitmaptest: Refactor checks in 'test6'
The 'checkBitmap' helper uses 'virBitmapFormat' internally and also
reports better errors. Use it instead of the open-coded checks.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/virbitmaptest.c | 44 ++++++-------------------------------------
1 file changed, 6 insertions(+), 38 deletions(-)
diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index c16be62e23..c59eb49265 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -407,7 +407,6 @@ static int
test6(const void *v G_GNUC_UNUSED)
{
virBitmapPtr bitmap = NULL;
- char *str = NULL;
int size = 64;
int ret = -1;
@@ -415,73 +414,42 @@ test6(const void *v G_GNUC_UNUSED)
if (!bitmap)
goto error;
- str = virBitmapFormat(bitmap);
- if (!str)
+ if (checkBitmap(bitmap, "", -1) < 0)
goto error;
- if (STRNEQ(str, ""))
- goto error;
-
- VIR_FREE(str);
-
ignore_value(virBitmapSetBit(bitmap, 0));
- str = virBitmapFormat(bitmap);
- if (!str)
- goto error;
- if (STRNEQ(str, "0"))
+ if (checkBitmap(bitmap, "0", -1) < 0)
goto error;
- VIR_FREE(str);
-
ignore_value(virBitmapSetBit(bitmap, 4));
ignore_value(virBitmapSetBit(bitmap, 5));
- str = virBitmapFormat(bitmap);
- if (!str)
- goto error;
- if (STRNEQ(str, "0,4-5"))
+ if (checkBitmap(bitmap, "0,4-5", -1) < 0)
goto error;
- VIR_FREE(str);
-
ignore_value(virBitmapSetBit(bitmap, 6));
- str = virBitmapFormat(bitmap);
- if (!str)
- goto error;
- if (STRNEQ(str, "0,4-6"))
+ if (checkBitmap(bitmap, "0,4-6", -1) < 0)
goto error;
- VIR_FREE(str);
-
ignore_value(virBitmapSetBit(bitmap, 13));
ignore_value(virBitmapSetBit(bitmap, 14));
ignore_value(virBitmapSetBit(bitmap, 15));
ignore_value(virBitmapSetBit(bitmap, 16));
- str = virBitmapFormat(bitmap);
- if (!str)
- goto error;
- if (STRNEQ(str, "0,4-6,13-16"))
+ if (checkBitmap(bitmap, "0,4-6,13-16", -1) < 0)
goto error;
- VIR_FREE(str);
-
ignore_value(virBitmapSetBit(bitmap, 62));
ignore_value(virBitmapSetBit(bitmap, 63));
- str = virBitmapFormat(bitmap);
- if (!str)
- goto error;
- if (STRNEQ(str, "0,4-6,13-16,62-63"))
+ if (checkBitmap(bitmap, "0,4-6,13-16,62-63", -1) < 0)
goto error;
-
ret = 0;
error:
virBitmapFree(bitmap);
- VIR_FREE(str);
return ret;
}
--
2.26.2