[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/14] tests: Don't check qobject_type() before qobj
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 11/14] tests: Don't check qobject_type() before qobject_to_qfloat() |
Date: |
Fri, 17 Feb 2017 21:38:22 +0100 |
qobject_to_qfloat(obj) returns NULL when obj isn't a QFloat. Check
that instead of qobject_type(obj) == QTYPE_QFLOAT.
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/check-qjson.c | 12 ++----------
tests/test-qobject-output-visitor.c | 8 ++++----
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index aab4e0a..591b70a 100644
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -921,10 +921,8 @@ static void float_number(void)
QFloat *qfloat;
obj = qobject_from_json(test_cases[i].encoded);
- g_assert(obj != NULL);
- g_assert(qobject_type(obj) == QTYPE_QFLOAT);
-
qfloat = qobject_to_qfloat(obj);
+ g_assert(qfloat);
g_assert(qfloat_get_double(qfloat) == test_cases[i].decoded);
if (test_cases[i].skip == 0) {
@@ -941,7 +939,6 @@ static void float_number(void)
static void vararg_number(void)
{
- QObject *obj;
QInt *qint;
QFloat *qfloat;
int value = 0x2342;
@@ -956,13 +953,8 @@ static void vararg_number(void)
g_assert(qint_get_int(qint) == value_ll);
QDECREF(qint);
- obj = qobject_from_jsonf("%f", valuef);
- g_assert(obj != NULL);
- g_assert(qobject_type(obj) == QTYPE_QFLOAT);
-
- qfloat = qobject_to_qfloat(obj);
+ qfloat = qobject_to_qfloat(qobject_from_jsonf("%f", valuef));
g_assert(qfloat_get_double(qfloat) == valuef);
-
QDECREF(qfloat);
}
diff --git a/tests/test-qobject-output-visitor.c
b/tests/test-qobject-output-visitor.c
index 50b807e..5617fd3 100644
--- a/tests/test-qobject-output-visitor.c
+++ b/tests/test-qobject-output-visitor.c
@@ -84,13 +84,13 @@ static void test_visitor_out_number(TestOutputVisitorData
*data,
const void *unused)
{
double value = 3.14;
- QObject *obj;
+ QFloat *qfloat;
visit_type_number(data->ov, NULL, &value, &error_abort);
- obj = visitor_get(data);
- g_assert(qobject_type(obj) == QTYPE_QFLOAT);
- g_assert(qfloat_get_double(qobject_to_qfloat(obj)) == value);
+ qfloat = qobject_to_qfloat(visitor_get(data));
+ g_assert(qfloat);
+ g_assert(qfloat_get_double(qfloat) == value);
}
static void test_visitor_out_string(TestOutputVisitorData *data,
--
2.7.4
- [Qemu-devel] [PATCH 00/14] qobject: Cleanups, mostly in tests, Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 01/14] qdict: Make qdict_get_qlist() safe like qdict_get_qdict(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 02/14] check-qdict: Simplify qdict_crumple_test_recursive(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 11/14] tests: Don't check qobject_type() before qobject_to_qfloat(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 06/14] test-qmp-event: Simplify and tighten event_test_emit(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 10/14] tests: Don't check qobject_type() before qobject_to_qint(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 07/14] Don't check qobject_type() before qobject_to_qdict(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 09/14] tests: Don't check qobject_type() before qobject_to_qstring(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 03/14] check-qdict: Tighten qdict_crumple_test_recursive() some, Markus Armbruster, 2017/02/17