[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/21] tests/check-qom-proplist: Improve iterator coverage
From: |
Markus Armbruster |
Subject: |
[PULL 08/21] tests/check-qom-proplist: Improve iterator coverage |
Date: |
Fri, 15 May 2020 08:04:11 +0200 |
The tests' "qemu-dummy" device has only class properties. Turn one of
them into an instance property. test_dummy_class_iterator() expects
one fewer property than test_dummy_iterator(). Rewrite
test_dummy_prop_iterator() to take expected properties as argument.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
---
tests/check-qom-proplist.c | 51 +++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c
index a8b2958e6e..140d56439a 100644
--- a/tests/check-qom-proplist.c
+++ b/tests/check-qom-proplist.c
@@ -130,17 +130,18 @@ static void dummy_init(Object *obj)
object_property_add_bool(obj, "bv",
dummy_get_bv,
dummy_set_bv,
- &err);
+ NULL);
+ /* duplicate: */
+ object_property_add_str(obj, "sv",
+ dummy_get_sv,
+ dummy_set_sv,
+ &err);
error_free_or_abort(&err);
}
static void dummy_class_init(ObjectClass *cls, void *data)
{
- object_class_property_add_bool(cls, "bv",
- dummy_get_bv,
- dummy_set_bv,
- NULL);
object_class_property_add_str(cls, "sv",
dummy_get_sv,
dummy_set_sv,
@@ -520,34 +521,33 @@ static void test_dummy_getenum(void)
}
-static void test_dummy_prop_iterator(ObjectPropertyIterator *iter)
+static void test_dummy_prop_iterator(ObjectPropertyIterator *iter,
+ const char *expected[], int n)
{
- bool seenbv = false, seensv = false, seenav = false, seentype = false;
ObjectProperty *prop;
+ int i;
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();
+ for (i = 0; i < n; i++) {
+ if (!g_strcmp0(prop->name, expected[i])) {
+ break;
+ }
}
+ g_assert(i < n);
+ expected[i] = NULL;
+ }
+
+ for (i = 0; i < n; i++) {
+ g_assert(!expected[i]);
}
- g_assert(seenbv);
- g_assert(seenav);
- g_assert(seensv);
- g_assert(seentype);
}
static void test_dummy_iterator(void)
{
+ const char *expected[] = {
+ "type", /* inherited from TYPE_OBJECT */
+ "sv", "av", /* class properties */
+ "bv"}; /* instance property */
Object *parent = object_get_objects_root();
DummyObject *dobj = DUMMY_OBJECT(
object_new_with_props(TYPE_DUMMY,
@@ -561,17 +561,18 @@ static void test_dummy_iterator(void)
ObjectPropertyIterator iter;
object_property_iter_init(&iter, OBJECT(dobj));
- test_dummy_prop_iterator(&iter);
+ test_dummy_prop_iterator(&iter, expected, ARRAY_SIZE(expected));
object_unparent(OBJECT(dobj));
}
static void test_dummy_class_iterator(void)
{
+ const char *expected[] = { "type", "av", "sv" };
ObjectPropertyIterator iter;
ObjectClass *klass = object_class_by_name(TYPE_DUMMY);
object_class_property_iter_init(&iter, klass);
- test_dummy_prop_iterator(&iter);
+ test_dummy_prop_iterator(&iter, expected, ARRAY_SIZE(expected));
}
static void test_dummy_delchild(void)
--
2.21.1
- [PULL 00/21] QOM patches for 2020-05-15, Markus Armbruster, 2020/05/15
- [PULL 01/21] qom: Clearer reference counting in object_initialize_childv(), Markus Armbruster, 2020/05/15
- [PULL 03/21] qom: Drop object_property_del_child()'s unused parameter @errp, Markus Armbruster, 2020/05/15
- [PULL 05/21] qom: Drop convenience method object_property_get_uint16List(), Markus Armbruster, 2020/05/15
- [PULL 02/21] qom: Clean up inconsistent use of gchar * vs. char *, Markus Armbruster, 2020/05/15
- [PULL 18/21] qom: Drop @errp parameter of object_property_del(), Markus Armbruster, 2020/05/15
- [PULL 13/21] qdev: Clean up qdev_connect_gpio_out_named(), Markus Armbruster, 2020/05/15
- [PULL 08/21] tests/check-qom-proplist: Improve iterator coverage,
Markus Armbruster <=
- [PULL 07/21] qom: Drop object_property_set_description() parameter @errp, Markus Armbruster, 2020/05/15
- [PULL 17/21] spapr_pci: Drop some dead error handling, Markus Armbruster, 2020/05/15
- [PULL 10/21] hw/isa/superio: Make the components QOM children, Markus Armbruster, 2020/05/15
- [PULL 09/21] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256, Markus Armbruster, 2020/05/15
- [PULL 06/21] qom: Make all the object_property_add_FOO() return the property, Markus Armbruster, 2020/05/15
- [PULL 15/21] Drop more @errp parameters after previous commit, Markus Armbruster, 2020/05/15
- [PULL 19/21] target: Remove unnecessary CPU() cast, Markus Armbruster, 2020/05/15
- [PULL 16/21] qdev: Unrealize must not fail, Markus Armbruster, 2020/05/15
- [PULL 04/21] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/05/15
- [PULL 11/21] e1000: Don't run e1000_instance_init() twice, Markus Armbruster, 2020/05/15