[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/16] test-qmp-event: Simplify and tighten event_tes
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 08/16] test-qmp-event: Simplify and tighten event_test_emit() |
Date: |
Wed, 22 Feb 2017 20:14:50 +0100 |
Use qdict_get_qdict() and qdict_get_try_int() to simplify.
While there, add a sanity check for seconds.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/test-qmp-event.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index 633dc87..7bb621b 100644
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -95,24 +95,18 @@ static bool qdict_cmp_simple(QDict *a, QDict *b)
correctness. */
static void event_test_emit(test_QAPIEvent event, QDict *d, Error **errp)
{
- QObject *obj;
QDict *t;
int64_t s, ms;
/* Verify that we have timestamp, then remove it to compare other fields */
- obj = qdict_get(d, "timestamp");
- g_assert(obj);
- t = qobject_to_qdict(obj);
+ t = qdict_get_qdict(d, "timestamp");
g_assert(t);
- obj = qdict_get(t, "seconds");
- g_assert(obj && qobject_type(obj) == QTYPE_QINT);
- s = qint_get_int(qobject_to_qint(obj));
- obj = qdict_get(t, "microseconds");
- g_assert(obj && qobject_type(obj) == QTYPE_QINT);
- ms = qint_get_int(qobject_to_qint(obj));
+ s = qdict_get_try_int(t, "seconds", -2);
+ ms = qdict_get_try_int(t, "microseconds", -2);
if (s == -1) {
g_assert(ms == -1);
} else {
+ g_assert(s >= 0);
g_assert(ms >= 0 && ms <= 999999);
}
g_assert(qdict_size(t) == 2);
--
2.7.4
- [Qemu-devel] [PULL 00/16] QAPI patches for 2017-02-22, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 08/16] test-qmp-event: Simplify and tighten event_test_emit(),
Markus Armbruster <=
- [Qemu-devel] [PULL 07/16] libqtest: Clean up qmp_response() a bit, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 01/16] numa: Flatten simple union NumaOptions, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 13/16] tests: Don't check qobject_type() before qobject_to_qfloat(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 10/16] tests: Don't check qobject_type() before qobject_to_qlist(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 16/16] block: Don't bother asserting type of output visitor's output, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 06/16] check-qjson: Simplify around compare_litqobj_to_qobj(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 11/16] tests: Don't check qobject_type() before qobject_to_qstring(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 03/16] qdict: Make qdict_get_qlist() safe like qdict_get_qdict(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 02/16] net: Flatten simple union NetLegacyOptions, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 04/16] check-qdict: Simplify qdict_crumple_test_recursive(), Markus Armbruster, 2017/02/22