ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/check-qjson: Don't skip funny QNumber to JSON conversions 

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>
Message-Id: <20201210161452.2813491-2-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-12-10 17:14:43 +01:00
parent 54aa3de72e
commit 3953f826a3
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/check-qjson.c
View File

@ -793,37 +793,35 @@ static void utf8_string(void)
static void simple_number(void) static void simple_number(void)
{ {
int i;
struct { struct {
const char *encoded; const char *encoded;
int64_t decoded; int64_t decoded;
int skip; const char *reencoded;
} test_cases[] = { } test_cases[] = {
{ "0", 0 }, { "0", 0 },
{ "1234", 1234 }, { "1234", 1234 },
{ "1", 1 }, { "1", 1 },
{ "-32", -32 }, { "-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++) { for (i = 0; test_cases[i].encoded; i++) {
QNum *qnum;
int64_t val;
qnum = qobject_to(QNum, qnum = qobject_to(QNum,
qobject_from_json(test_cases[i].encoded, qobject_from_json(test_cases[i].encoded,
&error_abort)); &error_abort));
g_assert(qnum); g_assert(qnum);
g_assert(qnum_get_try_int(qnum, &val)); g_assert(qnum_get_try_int(qnum, &val));
g_assert_cmpint(val, ==, test_cases[i].decoded); g_assert_cmpint(val, ==, test_cases[i].decoded);
if (test_cases[i].skip == 0) {
QString *str;
str = qobject_to_json(QOBJECT(qnum)); str = qobject_to_json(QOBJECT(qnum));
g_assert(strcmp(qstring_get_str(str), test_cases[i].encoded) == 0); g_assert_cmpstr(qstring_get_str(str), ==,
qobject_unref(str); test_cases[i].reencoded ?: test_cases[i].encoded);
} qobject_unref(str);
qobject_unref(qnum); qobject_unref(qnum);
} }
@ -874,35 +872,32 @@ static void large_number(void)
static void float_number(void) static void float_number(void)
{ {
int i;
struct { struct {
const char *encoded; const char *encoded;
double decoded; double decoded;
int skip; const char *reencoded;
} test_cases[] = { } test_cases[] = {
{ "32.43", 32.43 }, { "32.43", 32.43 },
{ "0.222", 0.222 }, { "0.222", 0.222 },
{ "-32.12313", -32.12313 }, { "-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++) { for (i = 0; test_cases[i].encoded; i++) {
QObject *obj; qnum = qobject_to(QNum,
QNum *qnum; qobject_from_json(test_cases[i].encoded,
&error_abort));
obj = qobject_from_json(test_cases[i].encoded, &error_abort);
qnum = qobject_to(QNum, obj);
g_assert(qnum); 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) { str = qobject_to_json(QOBJECT(qnum));
QString *str; g_assert_cmpstr(qstring_get_str(str), ==,
test_cases[i].reencoded ?: test_cases[i].encoded);
str = qobject_to_json(obj); qobject_unref(str);
g_assert(strcmp(qstring_get_str(str), test_cases[i].encoded) == 0);
qobject_unref(str);
}
qobject_unref(qnum); qobject_unref(qnum);
} }