Commit 94ef3b30 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

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



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

Fix uninitialized "seentype" variable.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 96330179

tests/check-qom-proplist.c

+24 −20
Original line number Diff line number Diff line
@@ -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));



    bool seenbv = false, seensv = false, seenav = false, seentype = false;

    ObjectProperty *prop;

    ObjectPropertyIterator iter;

    bool seenbv = false, seensv = false, seenav = false, seentype;



    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));

}