[Qemu-devel] [PATCH v2] check-qdict: Test termination of qdict_array_split()

[Qemu-devel] [PATCH v2] check-qdict: Test termination of qdict_array_split()

[Max Reitz]

qdict_array_split() should terminate if it encounters both an entry with
a key of "%u" and entries with keys prefixed "%u." for the same index.

This patch adds a test for this case.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
This is a followup to my "Extract non-QDicts in qdict_array_split()" series.

v2:
 - added missing QDECREF(int1)
---
 tests/check-qdict.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index 680e3c3..2ad0f78 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -389,6 +389,59 @@ static void qdict_array_split_test(void)
     g_assert(qdict_size(test_dict) == 2);
 
     QDECREF(test_dict);
+
+
+    /*
+     * Test the split of
+     *
+     * {
+     *     "0": 42,
+     *     "1": 23,
+     *     "1.x": 84
+     * }
+     *
+     * to
+     *
+     * [
+     *     42
+     * ]
+     *
+     * and
+     *
+     * {
+     *     "1": 23,
+     *     "1.x": 84
+     * }
+     *
+     * That is, test whether splitting stops if there is both an entry with key
+     * of "%u" and other entries with keys prefixed "%u." for the same index.
+     */
+
+    test_dict = qdict_new();
+
+    qdict_put(test_dict, "0", qint_from_int(42));
+    qdict_put(test_dict, "1", qint_from_int(23));
+    qdict_put(test_dict, "1.x", qint_from_int(84));
+
+    qdict_array_split(test_dict, &test_list);
+
+    int1 = qobject_to_qint(qlist_pop(test_list));
+
+    g_assert(int1);
+    g_assert(qlist_empty(test_list));
+
+    QDECREF(test_list);
+
+    g_assert(qint_get_int(int1) == 42);
+
+    QDECREF(int1);
+
+    g_assert(qdict_get_int(test_dict, "1") == 23);
+    g_assert(qdict_get_int(test_dict, "1.x") == 84);
+
+    g_assert(qdict_size(test_dict) == 2);
+
+    QDECREF(test_dict);
 }
 
 /*
-- 
1.9.0

Re: [Qemu-devel] [PATCH v2] check-qdict: Test termination of qdict_array_split()

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 961 bytes --]

On 02/21/2014 01:05 PM, Max Reitz wrote:
> qdict_array_split() should terminate if it encounters both an entry with
> a key of "%u" and entries with keys prefixed "%u." for the same index.
> 
> This patch adds a test for this case.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> This is a followup to my "Extract non-QDicts in qdict_array_split()" series.
> 

> +    /*
> +     * Test the split of
> +     *
> +     * {
> +     *     "0": 42,
> +     *     "1": 23,
> +     *     "1.x": 84
> +     * }

For good measure, I might have included a "2":..., which also does not
get split out (proving that we didn't just skip over 1 and go on to 2,
but actually stopped).  But at this point, I think you've covered the
code, so I won't insist.

Thanks for the extra test:
Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH v2] check-qdict: Test termination of qdict_array_split()

[Kevin Wolf]

[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]

Am 21.02.2014 um 21:34 hat Eric Blake geschrieben:
> On 02/21/2014 01:05 PM, Max Reitz wrote:
> > qdict_array_split() should terminate if it encounters both an entry with
> > a key of "%u" and entries with keys prefixed "%u." for the same index.
> > 
> > This patch adds a test for this case.
> > 
> > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > ---
> > This is a followup to my "Extract non-QDicts in qdict_array_split()" series.
> > 
> 
> > +    /*
> > +     * Test the split of
> > +     *
> > +     * {
> > +     *     "0": 42,
> > +     *     "1": 23,
> > +     *     "1.x": 84
> > +     * }
> 
> For good measure, I might have included a "2":..., which also does not
> get split out (proving that we didn't just skip over 1 and go on to 2,
> but actually stopped).  But at this point, I think you've covered the
> code, so I won't insist.
> 
> Thanks for the extra test:
> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks, applied to the block branch.

Kevin

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]