Skip to content

Commit

Permalink
check-qjson: Cover interpolation more thoroughly
Browse files Browse the repository at this point in the history 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-17-armbru@redhat.com>
  • Loading branch information
Markus Armbruster committed Aug 24, 2018
1 parent 6bc93a3 commit 2e933f5
Showing 1 changed file with 98 additions and 60 deletions.
158 changes: 98 additions & 60 deletions tests/check-qjson.c
View file
Expand Up @@ -876,30 +876,6 @@ static void utf8_string(void)
}
}

static void vararg_string(void)
{
int i;
struct {
const char *decoded;
} test_cases[] = {
{ "hello world" },
{ "the quick brown fox jumped over the fence" },
{}
};

for (i = 0; test_cases[i].decoded; i++) {
QString *str;

str = qobject_to(QString,
qobject_from_jsonf_nofail("%s",
test_cases[i].decoded));
g_assert(str);
g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0);

qobject_unref(str);
}
}

static void simple_number(void)
{
int i;
Expand Down Expand Up @@ -1017,29 +993,6 @@ static void float_number(void)
}
}

static void vararg_number(void)
{
QNum *qnum;
int value = 0x2342;
long long value_ll = 0x2342342343LL;
double valuef = 2.323423423;
int64_t val;

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%d", value));
g_assert(qnum_get_try_int(qnum, &val));
g_assert_cmpint(val, ==, value);
qobject_unref(qnum);

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%lld", value_ll));
g_assert(qnum_get_try_int(qnum, &val));
g_assert_cmpint(val, ==, value_ll);
qobject_unref(qnum);

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%f", valuef));
g_assert(qnum_get_double(qnum) == valuef);
qobject_unref(qnum);
}

static void keyword_literal(void)
{
QObject *obj;
Expand Down Expand Up @@ -1069,6 +1022,35 @@ static void keyword_literal(void)

qobject_unref(qbool);

obj = qobject_from_json("null", &error_abort);
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QNULL);

null = qnull();
g_assert(QOBJECT(null) == obj);

qobject_unref(obj);
qobject_unref(null);
}

static void interpolation_valid(void)
{
long long value_lld = 0x123456789abcdefLL;
long value_ld = (long)value_lld;
int value_d = (int)value_lld;
unsigned long long value_llu = 0xfedcba9876543210ULL;
unsigned long value_lu = (unsigned long)value_llu;
unsigned value_u = (unsigned)value_llu;
double value_f = 2.323423423;
const char *value_s = "hello world";
QObject *value_p = QOBJECT(qnull());
QBool *qbool;
QNum *qnum;
QString *qstr;
QObject *qobj;

/* bool */

qbool = qobject_to(QBool, qobject_from_jsonf_nofail("%i", false));
g_assert(qbool);
g_assert(qbool_get_bool(qbool) == false);
Expand All @@ -1080,15 +1062,70 @@ static void keyword_literal(void)
g_assert(qbool_get_bool(qbool) == true);
qobject_unref(qbool);

obj = qobject_from_json("null", &error_abort);
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QNULL);
/* number */

null = qnull();
g_assert(QOBJECT(null) == obj);
qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%d", value_d));
g_assert_cmpint(qnum_get_int(qnum), ==, value_d);
qobject_unref(qnum);

qobject_unref(obj);
qobject_unref(null);
qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%ld", value_ld));
g_assert_cmpint(qnum_get_int(qnum), ==, value_ld);
qobject_unref(qnum);

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%lld", value_lld));
g_assert_cmpint(qnum_get_int(qnum), ==, value_lld);
qobject_unref(qnum);

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%u", value_u));
g_assert_cmpuint(qnum_get_uint(qnum), ==, value_u);
qobject_unref(qnum);

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%lu", value_lu));
g_assert_cmpuint(qnum_get_uint(qnum), ==, value_lu);
qobject_unref(qnum);

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%llu", value_llu));
g_assert_cmpuint(qnum_get_uint(qnum), ==, value_llu);
qobject_unref(qnum);

qnum = qobject_to(QNum, qobject_from_jsonf_nofail("%f", value_f));
g_assert(qnum_get_double(qnum) == value_f);
qobject_unref(qnum);

/* string */

qstr = qobject_to(QString,
qobject_from_jsonf_nofail("%s", value_s));
g_assert_cmpstr(qstring_get_try_str(qstr), ==, value_s);
qobject_unref(qstr);

/* object */

qobj = qobject_from_jsonf_nofail("%p", value_p);
g_assert(qobj == value_p);
}

static void interpolation_unknown(void)
{
if (g_test_subprocess()) {
qobject_from_jsonf_nofail("%x", 666);
}
g_test_trap_subprocess(NULL, 0, 0);
g_test_trap_assert_failed();
}

static void interpolation_string(void)
{
QLitObject decoded = QLIT_QLIST(((QLitObject[]){
QLIT_QSTR("%s"),
QLIT_QSTR("eins"),
{}}));
QObject *qobj;

/* Dangerous misfeature: % is silently ignored in strings */
qobj = qobject_from_jsonf_nofail("['%s', %s]", "eins", "zwei");
g_assert(qlit_equal_qobject(&decoded, qobj));
qobject_unref(qobj);
}

static void simple_dict(void)
Expand Down Expand Up @@ -1309,7 +1346,7 @@ static void simple_whitespace(void)
}
}

static void simple_varargs(void)
static void simple_interpolation(void)
{
QObject *embedded_obj;
QObject *obj;
Expand Down Expand Up @@ -1506,22 +1543,23 @@ int main(int argc, char **argv)
g_test_add_func("/literals/string/escaped", escaped_string);
g_test_add_func("/literals/string/quotes", string_with_quotes);
g_test_add_func("/literals/string/utf8", utf8_string);
g_test_add_func("/literals/string/vararg", vararg_string);

g_test_add_func("/literals/number/simple", simple_number);
g_test_add_func("/literals/number/large", large_number);
g_test_add_func("/literals/number/float", float_number);
g_test_add_func("/literals/number/vararg", vararg_number);

g_test_add_func("/literals/keyword", keyword_literal);

g_test_add_func("/literals/interpolation/valid", interpolation_valid);
g_test_add_func("/literals/interpolation/unkown", interpolation_unknown);
g_test_add_func("/literals/interpolation/string", interpolation_string);

g_test_add_func("/dicts/simple_dict", simple_dict);
g_test_add_func("/dicts/large_dict", large_dict);
g_test_add_func("/lists/simple_list", simple_list);

g_test_add_func("/whitespace/simple_whitespace", simple_whitespace);

g_test_add_func("/varargs/simple_varargs", simple_varargs);
g_test_add_func("/mixed/simple_whitespace", simple_whitespace);
g_test_add_func("/mixed/interpolation", simple_interpolation);

g_test_add_func("/errors/empty", empty_input);
g_test_add_func("/errors/blank", blank_input);
Expand Down

0 comments on commit 2e933f5

Please sign in to comment.