[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 08/12] tests/qom-proplist: check properties a
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v2 08/12] tests/qom-proplist: check properties are not listed multiple times |
Date: |
Wed, 3 Oct 2018 15:01:56 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 |
On 07/09/2018 09:59, Marc-André Lureau wrote:
> 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));
> }
>
>
Reviewed-by: Paolo Bonzini <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH v2 08/12] tests/qom-proplist: check properties are not listed multiple times,
Paolo Bonzini <=