[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/12] tests/qom-proplist: check properties are n
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 08/12] tests/qom-proplist: check properties are not listed multiple times |
Date: |
Fri, 7 Sep 2018 11:59:44 +0400 |
And factor out a common function used by the follow class properties
iterator test.
Signed-off-by: Marc-André Lureau <address@hidden>
---
tests/check-qom-proplist.c | 44 +++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c
index 0f6d9c1ce3..8e1b9c27f3 100644
--- a/tests/check-qom-proplist.c
+++ b/tests/check-qom-proplist.c
@@ -520,32 +520,19 @@ static void test_dummy_getenum(void)
}
-static void test_dummy_iterator(void)
+static void test_dummy_prop_iterator(ObjectPropertyIterator *iter)
{
- Object *parent = object_get_objects_root();
- DummyObject *dobj = DUMMY_OBJECT(
- object_new_with_props(TYPE_DUMMY,
- parent,
- "dummy0",
- &error_abort,
- "bv", "yes",
- "sv", "Hiss hiss hiss",
- "av", "platypus",
- NULL));
-
- ObjectProperty *prop;
- ObjectPropertyIterator iter;
bool seenbv = false, seensv = false, seenav = false, seentype;
+ ObjectProperty *prop;
- object_property_iter_init(&iter, OBJECT(dobj));
- while ((prop = object_property_iter_next(&iter))) {
- if (g_str_equal(prop->name, "bv")) {
+ while ((prop = object_property_iter_next(iter))) {
+ if (!seenbv && g_str_equal(prop->name, "bv")) {
seenbv = true;
- } else if (g_str_equal(prop->name, "sv")) {
+ } else if (!seensv && g_str_equal(prop->name, "sv")) {
seensv = true;
- } else if (g_str_equal(prop->name, "av")) {
+ } else if (!seenav && g_str_equal(prop->name, "av")) {
seenav = true;
- } else if (g_str_equal(prop->name, "type")) {
+ } else if (!seentype && g_str_equal(prop->name, "type")) {
/* This prop comes from the base Object class */
seentype = true;
} else {
@@ -557,7 +544,24 @@ static void test_dummy_iterator(void)
g_assert(seenav);
g_assert(seensv);
g_assert(seentype);
+}
+
+static void test_dummy_iterator(void)
+{
+ Object *parent = object_get_objects_root();
+ DummyObject *dobj = DUMMY_OBJECT(
+ object_new_with_props(TYPE_DUMMY,
+ parent,
+ "dummy0",
+ &error_abort,
+ "bv", "yes",
+ "sv", "Hiss hiss hiss",
+ "av", "platypus",
+ NULL));
+ ObjectPropertyIterator iter;
+ object_property_iter_init(&iter, OBJECT(dobj));
+ test_dummy_prop_iterator(&iter);
object_unparent(OBJECT(dobj));
}
--
2.19.0.rc1
- [Qemu-devel] [PATCH v2 02/12] cutils: add qemu_pstrcmp, (continued)
- [Qemu-devel] [PATCH v2 03/12] qemu-option: add help fallback to print the list of options, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 04/12] qemu-option: improve qemu_opts_print_help() output, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 05/12] qom/object: fix iterating properties over a class, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 07/12] tests/qom-proplist: check duplicate "bv" property registration failed, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 06/12] qom/object: register 'type' property as class property, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 08/12] tests/qom-proplist: check properties are not listed multiple times,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 09/12] tests/qom-proplist: check class properties iterator, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 10/12] vl: handle -object help, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 12/12] vl: list user creatable properties when 'help' is argument, Marc-André Lureau, 2018/09/07
- [Qemu-devel] [PATCH v2 11/12] hostmem: add some properties description, Marc-André Lureau, 2018/09/07
- Re: [Qemu-devel] [PATCH v2 00/12] Various qemu command line options help improvements, Paolo Bonzini, 2018/09/11