[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/54] check-qdict: Adjust test for qdict_array_split
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 39/54] check-qdict: Adjust test for qdict_array_split() |
Date: |
Fri, 21 Feb 2014 23:12:36 +0100 |
From: Max Reitz <address@hidden>
Test the new functionality of qdict_array_split(), that is, splitting
off single objects.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/check-qdict.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index 7a7461b..680e3c3 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -306,6 +306,7 @@ static void qdict_array_split_test(void)
{
QDict *test_dict = qdict_new();
QDict *dict1, *dict2;
+ QInt *int1;
QList *test_list;
/*
@@ -313,10 +314,11 @@ static void qdict_array_split_test(void)
*
* {
* "1.x": 0,
- * "3.y": 1,
+ * "4.y": 1,
* "0.a": 42,
* "o.o": 7,
- * "0.b": 23
+ * "0.b": 23,
+ * "2": 66
* }
*
* to
@@ -328,13 +330,14 @@ static void qdict_array_split_test(void)
* },
* {
* "x": 0
- * }
+ * },
+ * 66
* ]
*
* and
*
* {
- * "3.y": 1,
+ * "4.y": 1,
* "o.o": 7
* }
*
@@ -344,18 +347,21 @@ static void qdict_array_split_test(void)
*/
qdict_put(test_dict, "1.x", qint_from_int(0));
- qdict_put(test_dict, "3.y", qint_from_int(1));
+ qdict_put(test_dict, "4.y", qint_from_int(1));
qdict_put(test_dict, "0.a", qint_from_int(42));
qdict_put(test_dict, "o.o", qint_from_int(7));
qdict_put(test_dict, "0.b", qint_from_int(23));
+ qdict_put(test_dict, "2", qint_from_int(66));
qdict_array_split(test_dict, &test_list);
dict1 = qobject_to_qdict(qlist_pop(test_list));
dict2 = qobject_to_qdict(qlist_pop(test_list));
+ int1 = qobject_to_qint(qlist_pop(test_list));
g_assert(dict1);
g_assert(dict2);
+ g_assert(int1);
g_assert(qlist_empty(test_list));
QDECREF(test_list);
@@ -373,7 +379,11 @@ static void qdict_array_split_test(void)
QDECREF(dict2);
- g_assert(qdict_get_int(test_dict, "3.y") == 1);
+ g_assert(qint_get_int(int1) == 66);
+
+ QDECREF(int1);
+
+ g_assert(qdict_get_int(test_dict, "4.y") == 1);
g_assert(qdict_get_int(test_dict, "o.o") == 7);
g_assert(qdict_size(test_dict) == 2);
--
1.8.1.4
- [Qemu-devel] [PULL 33/54] qemu-img convert: Support multiple -o options, (continued)
- [Qemu-devel] [PULL 33/54] qemu-img convert: Support multiple -o options, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 34/54] qemu-img amend: Support multiple -o options, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 35/54] qemu-img: Allow -o help with incomplete argument list, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 36/54] qemu-iotests: Check qemu-img command line parsing, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 37/54] qemu-config: Sections must consist of keys, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 38/54] qdict: Extract non-QDicts in qdict_array_split(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 41/54] quorum: Create quorum.c, add QuorumChildRequest and QuorumAIOCB., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 42/54] quorum: Create BDRVQuorumState and BlkDriver and do init., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 43/54] quorum: Add quorum_aio_writev and its dependencies., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 40/54] check-qdict: Test termination of qdict_array_split(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 39/54] check-qdict: Adjust test for qdict_array_split(),
Kevin Wolf <=
- [Qemu-devel] [PULL 44/54] blkverify: Extract qemu_iovec_clone() and qemu_iovec_compare() from blkverify., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 45/54] quorum: Add quorum_aio_readv., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 46/54] quorum: Add quorum mechanism., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 48/54] quorum: Add quorum_invalidate_cache()., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 47/54] quorum: Add quorum_getlength()., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 49/54] quorum: Add quorum_co_flush()., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 50/54] quorum: Implement recursive .bdrv_recurse_is_first_non_filter in quorum., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 51/54] quorum: Add quorum_open() and quorum_close()., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 52/54] quorum: Add unit test., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 53/54] quorum: Simplify quorum_open(), Kevin Wolf, 2014/02/21