david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/qom-proplist: check properties are not listed multiple times

Browse Source 
And factor out a common function used by the follow class properties
iterator test.

Fix uninitialized "seentype" variable.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-09-06 18:13:34 +04:00
parent 9633017998
commit 94ef3b3092
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tests/check-qom-proplist.c
View File

@ -520,6 +520,32 @@ static void test_dummy_getenum(void)
} }
static void test_dummy_prop_iterator(ObjectPropertyIterator *iter)
{
bool seenbv = false, seensv = false, seenav = false, seentype = false;
ObjectProperty *prop;
while ((prop = object_property_iter_next(iter))) {
if (!seenbv && g_str_equal(prop->name, "bv")) {
seenbv = true;
} else if (!seensv && g_str_equal(prop->name, "sv")) {
seensv = true;
} else if (!seenav && g_str_equal(prop->name, "av")) {
seenav = true;
} else if (!seentype && g_str_equal(prop->name, "type")) {
/* This prop comes from the base Object class */
seentype = true;
} else {
g_printerr("Found prop '%s'\n", prop->name);
g_assert_not_reached();
}
}
g_assert(seenbv);
g_assert(seenav);
g_assert(seensv);
g_assert(seentype);
}
static void test_dummy_iterator(void) static void test_dummy_iterator(void)
{ {
Object *parent = object_get_objects_root(); Object *parent = object_get_objects_root();
@ -532,32 +558,10 @@ static void test_dummy_iterator(void)
"sv", "Hiss hiss hiss", "sv", "Hiss hiss hiss",
"av", "platypus", "av", "platypus",
NULL)); NULL));
ObjectProperty *prop;
ObjectPropertyIterator iter; ObjectPropertyIterator iter;
bool seenbv = false, seensv = false, seenav = false, seentype;
object_property_iter_init(&iter, OBJECT(dobj)); object_property_iter_init(&iter, OBJECT(dobj));
while ((prop = object_property_iter_next(&iter))) { test_dummy_prop_iterator(&iter);
if (g_str_equal(prop->name, "bv")) {
seenbv = true;
} else if (g_str_equal(prop->name, "sv")) {
seensv = true;
} else if (g_str_equal(prop->name, "av")) {
seenav = true;
} else if (g_str_equal(prop->name, "type")) {
/* This prop comes from the base Object class */
seentype = true;
} else {
g_printerr("Found prop '%s'\n", prop->name);
g_assert_not_reached();
}
}
g_assert(seenbv);
g_assert(seenav);
g_assert(seensv);
g_assert(seentype);
object_unparent(OBJECT(dobj)); object_unparent(OBJECT(dobj));
} }