SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: replace free_all() usage with g_auto

Browse Source 
Use more idiomatic glib/auto-style code.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220323155743.1585078-11-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-03-23 19:57:21 +04:00 committed by Paolo Bonzini
parent d709bbf3b1
commit b307e5052d
1 changed files with 40 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
tests/unit/check-qobject.c
View File

@ -74,21 +74,6 @@ static void do_test_equality(bool expected, int _, ...)
#define check_unequal(...) \ #define check_unequal(...) \
do_test_equality(false, 0, __VA_ARGS__, &test_equality_end_of_arguments) do_test_equality(false, 0, __VA_ARGS__, &test_equality_end_of_arguments)
static void do_free_all(int _, ...)
{
va_list ap;
QObject *obj;
va_start(ap, _);
while ((obj = va_arg(ap, QObject *)) != NULL) {
qobject_unref(obj);
}
va_end(ap);
}
#define free_all(...) \
do_free_all(0, __VA_ARGS__, NULL)
static void qobject_is_equal_null_test(void) static void qobject_is_equal_null_test(void)
{ {
check_unequal(qnull(), NULL); check_unequal(qnull(), NULL);
@ -96,15 +81,14 @@ static void qobject_is_equal_null_test(void)
static void qobject_is_equal_num_test(void) static void qobject_is_equal_num_test(void)
{ {
QNum *u0, *i0, *d0, *dnan, *um42, *im42, *dm42; g_autoptr(QNum) u0 = qnum_from_uint(0u);
g_autoptr(QNum) i0 = qnum_from_int(0);
g_autoptr(QNum) d0 = qnum_from_double(0.0);
g_autoptr(QNum) dnan = qnum_from_double(NAN);
g_autoptr(QNum) um42 = qnum_from_uint((uint64_t)-42);
g_autoptr(QNum) im42 = qnum_from_int(-42);
g_autoptr(QNum) dm42 = qnum_from_double(-42.0);
u0 = qnum_from_uint(0u);
i0 = qnum_from_int(0);
d0 = qnum_from_double(0.0);
dnan = qnum_from_double(NAN);
um42 = qnum_from_uint((uint64_t)-42);
im42 = qnum_from_int(-42);
dm42 = qnum_from_double(-42.0);
/* Integers representing a mathematically equal number should /* Integers representing a mathematically equal number should
* compare equal */ * compare equal */
@ -121,60 +105,45 @@ static void qobject_is_equal_num_test(void)
check_unequal(um42, im42); check_unequal(um42, im42);
check_unequal(um42, dm42); check_unequal(um42, dm42);
check_unequal(im42, dm42); check_unequal(im42, dm42);
free_all(u0, i0, d0, dnan, um42, im42, dm42);
} }
static void qobject_is_equal_bool_test(void) static void qobject_is_equal_bool_test(void)
{ {
QBool *btrue_0, *btrue_1, *bfalse_0, *bfalse_1; g_autoptr(QBool) btrue_0 = qbool_from_bool(true);
g_autoptr(QBool) btrue_1 = qbool_from_bool(true);
btrue_0 = qbool_from_bool(true); g_autoptr(QBool) bfalse_0 = qbool_from_bool(false);
btrue_1 = qbool_from_bool(true); g_autoptr(QBool) bfalse_1 = qbool_from_bool(false);
bfalse_0 = qbool_from_bool(false);
bfalse_1 = qbool_from_bool(false);
check_equal(btrue_0, btrue_1); check_equal(btrue_0, btrue_1);
check_equal(bfalse_0, bfalse_1); check_equal(bfalse_0, bfalse_1);
check_unequal(btrue_0, bfalse_0); check_unequal(btrue_0, bfalse_0);
free_all(btrue_0, btrue_1, bfalse_0, bfalse_1);
} }
static void qobject_is_equal_string_test(void) static void qobject_is_equal_string_test(void)
{ {
QString *str_base, *str_whitespace_0, *str_whitespace_1, *str_whitespace_2; g_autoptr(QString) str_base = qstring_from_str("foo");
QString *str_whitespace_3, *str_case, *str_built; g_autoptr(QString) str_whitespace_0 = qstring_from_str(" foo");
g_autoptr(QString) str_whitespace_1 = qstring_from_str("foo ");
str_base = qstring_from_str("foo"); g_autoptr(QString) str_whitespace_2 = qstring_from_str("foo\b");
str_whitespace_0 = qstring_from_str(" foo"); g_autoptr(QString) str_whitespace_3 = qstring_from_str("fooo\b");
str_whitespace_1 = qstring_from_str("foo "); g_autoptr(QString) str_case = qstring_from_str("Foo");
str_whitespace_2 = qstring_from_str("foo\b");
str_whitespace_3 = qstring_from_str("fooo\b");
str_case = qstring_from_str("Foo");
/* Should yield "foo" */ /* Should yield "foo" */
str_built = qstring_from_substr("buffoon", 3, 6); g_autoptr(QString) str_built = qstring_from_substr("buffoon", 3, 6);
check_unequal(str_base, str_whitespace_0, str_whitespace_1, check_unequal(str_base, str_whitespace_0, str_whitespace_1,
str_whitespace_2, str_whitespace_3, str_case); str_whitespace_2, str_whitespace_3, str_case);
check_equal(str_base, str_built); check_equal(str_base, str_built);
free_all(str_base, str_whitespace_0, str_whitespace_1, str_whitespace_2,
str_whitespace_3, str_case, str_built);
} }
static void qobject_is_equal_list_test(void) static void qobject_is_equal_list_test(void)
{ {
QList *list_0, *list_1, *list_cloned; g_autoptr(QList) list_0 = qlist_new();
QList *list_reordered, *list_longer, *list_shorter; g_autoptr(QList) list_1 = qlist_new();
g_autoptr(QList) list_reordered = qlist_new();
list_0 = qlist_new(); g_autoptr(QList) list_longer = qlist_new();
list_1 = qlist_new(); g_autoptr(QList) list_shorter = qlist_new();
list_reordered = qlist_new(); g_autoptr(QList) list_cloned = NULL;
list_longer = qlist_new();
list_shorter = qlist_new();
qlist_append_int(list_0, 1); qlist_append_int(list_0, 1);
qlist_append_int(list_0, 2); qlist_append_int(list_0, 2);
@ -205,26 +174,20 @@ static void qobject_is_equal_list_test(void)
* itself */ * itself */
qlist_append(list_0, qnum_from_double(NAN)); qlist_append(list_0, qnum_from_double(NAN));
g_assert(qobject_is_equal(QOBJECT(list_0), QOBJECT(list_0)) == false); g_assert(qobject_is_equal(QOBJECT(list_0), QOBJECT(list_0)) == false);
free_all(list_0, list_1, list_cloned, list_reordered, list_longer,
list_shorter);
} }
static void qobject_is_equal_dict_test(void) static void qobject_is_equal_dict_test(void)
{ {
QDict *dict_0, *dict_1, *dict_cloned; g_autoptr(QDict) dict_cloned = NULL;
QDict *dict_different_key, *dict_different_value, *dict_different_null_key; g_autoptr(QDict) dict_crumpled = NULL;
QDict *dict_longer, *dict_shorter, *dict_nested; g_autoptr(QDict) dict_0 = qdict_new();
QDict *dict_crumpled; g_autoptr(QDict) dict_1 = qdict_new();
g_autoptr(QDict) dict_different_key = qdict_new();
dict_0 = qdict_new(); g_autoptr(QDict) dict_different_value = qdict_new();
dict_1 = qdict_new(); g_autoptr(QDict) dict_different_null_key = qdict_new();
dict_different_key = qdict_new(); g_autoptr(QDict) dict_longer = qdict_new();
dict_different_value = qdict_new(); g_autoptr(QDict) dict_shorter = qdict_new();
dict_different_null_key = qdict_new(); g_autoptr(QDict) dict_nested = qdict_new();
dict_longer = qdict_new();
dict_shorter = qdict_new();
dict_nested = qdict_new();
qdict_put_int(dict_0, "f.o", 1); qdict_put_int(dict_0, "f.o", 1);
qdict_put_int(dict_0, "bar", 2); qdict_put_int(dict_0, "bar", 2);
@ -284,31 +247,21 @@ static void qobject_is_equal_dict_test(void)
* itself */ * itself */
qdict_put(dict_0, "NaN", qnum_from_double(NAN)); qdict_put(dict_0, "NaN", qnum_from_double(NAN));
g_assert(qobject_is_equal(QOBJECT(dict_0), QOBJECT(dict_0)) == false); g_assert(qobject_is_equal(QOBJECT(dict_0), QOBJECT(dict_0)) == false);
free_all(dict_0, dict_1, dict_cloned, dict_different_key,
dict_different_value, dict_different_null_key, dict_longer,
dict_shorter, dict_nested, dict_crumpled);
} }
static void qobject_is_equal_conversion_test(void) static void qobject_is_equal_conversion_test(void)
{ {
QNum *u0, *i0, *d0; g_autoptr(QNum) u0 = qnum_from_uint(0u);
QString *s0, *s_empty; g_autoptr(QNum) i0 = qnum_from_int(0);
QBool *bfalse; g_autoptr(QNum) d0 = qnum_from_double(0.0);
g_autoptr(QString) s0 = qstring_from_str("0");
u0 = qnum_from_uint(0u); g_autoptr(QString) s_empty = qstring_new();
i0 = qnum_from_int(0); g_autoptr(QBool) bfalse = qbool_from_bool(false);
d0 = qnum_from_double(0.0);
s0 = qstring_from_str("0");
s_empty = qstring_new();
bfalse = qbool_from_bool(false);
/* No automatic type conversion */ /* No automatic type conversion */
check_unequal(u0, s0, s_empty, bfalse, qnull(), NULL); check_unequal(u0, s0, s_empty, bfalse, qnull(), NULL);
check_unequal(i0, s0, s_empty, bfalse, qnull(), NULL); check_unequal(i0, s0, s_empty, bfalse, qnull(), NULL);
check_unequal(d0, s0, s_empty, bfalse, qnull(), NULL); check_unequal(d0, s0, s_empty, bfalse, qnull(), NULL);
free_all(u0, i0, d0, s0, s_empty, bfalse);
} }
int main(int argc, char **argv) int main(int argc, char **argv)