[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/10] tests/check-qjson: Don't skip funny QNumber to JSON conver
From: |
Markus Armbruster |
Subject: |
[PATCH 01/10] tests/check-qjson: Don't skip funny QNumber to JSON conversions |
Date: |
Thu, 10 Dec 2020 17:14:43 +0100 |
simple_number() and float_number() convert from JSON to QNumber and
back.
simple_number() tests "-0", but skips the conversion back to JSON,
because it yields "0", not "-0". Works as intended, so better cover
it: don't skip, but expect the funny result.
float_number() tests "-32.20e-10", but skips the conversion back to
JSON, because it yields "-0". This is a known bug in
qnum_to_string(), marked FIXME there. Cover the bug: don't skip, but
expect the funny result.
While there, switch from g_assert() to g_assert_cmpstr() & friends for
friendlier test failures.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/check-qjson.c | 55 +++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 30 deletions(-)
diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index 9a02079099..2a5852904a 100644
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -793,37 +793,35 @@ static void utf8_string(void)
static void simple_number(void)
{
- int i;
struct {
const char *encoded;
int64_t decoded;
- int skip;
+ const char *reencoded;
} test_cases[] = {
{ "0", 0 },
{ "1234", 1234 },
{ "1", 1 },
{ "-32", -32 },
- { "-0", 0, .skip = 1 },
- { },
+ { "-0", 0, "0" },
+ {},
};
+ int i;
+ QNum *qnum;
+ int64_t val;
+ QString *str;
for (i = 0; test_cases[i].encoded; i++) {
- QNum *qnum;
- int64_t val;
-
qnum = qobject_to(QNum,
qobject_from_json(test_cases[i].encoded,
&error_abort));
g_assert(qnum);
g_assert(qnum_get_try_int(qnum, &val));
g_assert_cmpint(val, ==, test_cases[i].decoded);
- if (test_cases[i].skip == 0) {
- QString *str;
- str = qobject_to_json(QOBJECT(qnum));
- g_assert(strcmp(qstring_get_str(str), test_cases[i].encoded) == 0);
- qobject_unref(str);
- }
+ str = qobject_to_json(QOBJECT(qnum));
+ g_assert_cmpstr(qstring_get_str(str), ==,
+ test_cases[i].reencoded ?: test_cases[i].encoded);
+ qobject_unref(str);
qobject_unref(qnum);
}
@@ -874,35 +872,32 @@ static void large_number(void)
static void float_number(void)
{
- int i;
struct {
const char *encoded;
double decoded;
- int skip;
+ const char *reencoded;
} test_cases[] = {
{ "32.43", 32.43 },
{ "0.222", 0.222 },
{ "-32.12313", -32.12313 },
- { "-32.20e-10", -32.20e-10, .skip = 1 },
- { },
+ { "-32.20e-10", -32.20e-10, "-0" /* BUG */ },
+ {},
};
+ int i;
+ QNum *qnum;
+ QString *str;
for (i = 0; test_cases[i].encoded; i++) {
- QObject *obj;
- QNum *qnum;
-
- obj = qobject_from_json(test_cases[i].encoded, &error_abort);
- qnum = qobject_to(QNum, obj);
+ qnum = qobject_to(QNum,
+ qobject_from_json(test_cases[i].encoded,
+ &error_abort));
g_assert(qnum);
- g_assert(qnum_get_double(qnum) == test_cases[i].decoded);
+ g_assert_cmpfloat(qnum_get_double(qnum), ==, test_cases[i].decoded);
- if (test_cases[i].skip == 0) {
- QString *str;
-
- str = qobject_to_json(obj);
- g_assert(strcmp(qstring_get_str(str), test_cases[i].encoded) == 0);
- qobject_unref(str);
- }
+ str = qobject_to_json(QOBJECT(qnum));
+ g_assert_cmpstr(qstring_get_str(str), ==,
+ test_cases[i].reencoded ?: test_cases[i].encoded);
+ qobject_unref(str);
qobject_unref(qnum);
}
--
2.26.2
- [PATCH 00/10] Fix floating-point -> text conversion precision, Markus Armbruster, 2020/12/10
- [PATCH 09/10] test-visitor-serialization: Drop insufficient precision workaround, Markus Armbruster, 2020/12/10
- [PATCH 05/10] tests/check-qnum: Cover qnum_to_string() for "unround" argument, Markus Armbruster, 2020/12/10
- [PATCH 03/10] tests/check-qjson: Cover number 2^63, Markus Armbruster, 2020/12/10
- [PATCH 07/10] test-string-output-visitor: Cover "unround" number, Markus Armbruster, 2020/12/10
- [PATCH 02/10] tests/check-qjson: Examine QNum more thoroughly, Markus Armbruster, 2020/12/10
- [PATCH 01/10] tests/check-qjson: Don't skip funny QNumber to JSON conversions,
Markus Armbruster <=
- [PATCH 04/10] tests/check-qjson: Replace redundant large_number(), Markus Armbruster, 2020/12/10
- [PATCH 10/10] test-visitor-serialization: Clean up test_primitives(), Markus Armbruster, 2020/12/10
- [PATCH 08/10] string-output-visitor: Fix to use sufficient precision, Markus Armbruster, 2020/12/10
- [PATCH 06/10] qobject: Fix qnum_to_string() to use sufficient precision, Markus Armbruster, 2020/12/10
- Re: [PATCH 00/10] Fix floating-point -> text conversion precision, no-reply, 2020/12/10