tree-wide: use typed SD_JSON_BUILD_PAIR_* macros more
This commit is contained in:
Frantisek Sumsal
@@ -395,13 +395,13 @@ TEST(json) {
|
||||
SD_JSON_BUILD_ARRAY(
|
||||
SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("foo_bar", JSON_BUILD_CONST_STRING("v1")),
|
||||
SD_JSON_BUILD_PAIR("quux", SD_JSON_BUILD_UNSIGNED(4711)),
|
||||
SD_JSON_BUILD_PAIR("zzz", SD_JSON_BUILD_BOOLEAN(true)),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("quux", 4711),
|
||||
SD_JSON_BUILD_PAIR_BOOLEAN("zzz", true),
|
||||
SD_JSON_BUILD_PAIR("asdf-custom", SD_JSON_BUILD_NULL)),
|
||||
SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("foo_bar", SD_JSON_BUILD_STRV(STRV_MAKE("a", "b", "c"))),
|
||||
SD_JSON_BUILD_PAIR("quux", SD_JSON_BUILD_NULL),
|
||||
SD_JSON_BUILD_PAIR("zzz", SD_JSON_BUILD_UNSIGNED(0755)),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("zzz", 0755),
|
||||
SD_JSON_BUILD_PAIR("asdf-custom", SD_JSON_BUILD_NULL)))));
|
||||
|
||||
ASSERT_TRUE(sd_json_variant_equal(v, w));
|
||||
@@ -624,23 +624,23 @@ TEST(signed_integers) {
|
||||
ASSERT_OK(sd_json_build(&b,
|
||||
SD_JSON_BUILD_ARRAY(
|
||||
SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("int", SD_JSON_BUILD_INTEGER(-1)),
|
||||
SD_JSON_BUILD_PAIR("int8", SD_JSON_BUILD_INTEGER(-1)),
|
||||
SD_JSON_BUILD_PAIR("int16", SD_JSON_BUILD_INTEGER(-1)),
|
||||
SD_JSON_BUILD_PAIR("int32", SD_JSON_BUILD_INTEGER(-1)),
|
||||
SD_JSON_BUILD_PAIR("int64", SD_JSON_BUILD_INTEGER(-1))),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int", -1),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int8", -1),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int16", -1),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int32", -1),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int64", -1)),
|
||||
SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("int", SD_JSON_BUILD_INTEGER(INT_MAX)),
|
||||
SD_JSON_BUILD_PAIR("int8", SD_JSON_BUILD_INTEGER(INT8_MAX)),
|
||||
SD_JSON_BUILD_PAIR("int16", SD_JSON_BUILD_INTEGER(INT16_MAX)),
|
||||
SD_JSON_BUILD_PAIR("int32", SD_JSON_BUILD_INTEGER(INT32_MAX)),
|
||||
SD_JSON_BUILD_PAIR("int64", SD_JSON_BUILD_INTEGER(INT64_MAX))),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int", INT_MAX),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int8", INT8_MAX),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int16", INT16_MAX),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int32", INT32_MAX),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int64", INT64_MAX)),
|
||||
SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("int", SD_JSON_BUILD_INTEGER(INT_MIN)),
|
||||
SD_JSON_BUILD_PAIR("int8", SD_JSON_BUILD_INTEGER(INT8_MIN)),
|
||||
SD_JSON_BUILD_PAIR("int16", SD_JSON_BUILD_INTEGER(INT16_MIN)),
|
||||
SD_JSON_BUILD_PAIR("int32", SD_JSON_BUILD_INTEGER(INT32_MIN)),
|
||||
SD_JSON_BUILD_PAIR("int64", SD_JSON_BUILD_INTEGER(INT64_MIN))))));
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int", INT_MIN),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int8", INT8_MIN),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int16", INT16_MIN),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int32", INT32_MIN),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("int64", INT64_MIN)))));
|
||||
sd_json_variant_dump(b, SD_JSON_FORMAT_NEWLINE, stdout, NULL);
|
||||
|
||||
ASSERT_TRUE(sd_json_variant_equal(a, b));
|
||||
@@ -686,21 +686,21 @@ TEST(unsigned_integers) {
|
||||
ASSERT_OK(sd_json_build(&b,
|
||||
SD_JSON_BUILD_ARRAY(
|
||||
SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("uint", SD_JSON_BUILD_UNSIGNED(0)),
|
||||
SD_JSON_BUILD_PAIR("uint8", SD_JSON_BUILD_UNSIGNED(0)),
|
||||
SD_JSON_BUILD_PAIR("uint16", SD_JSON_BUILD_UNSIGNED(0)),
|
||||
SD_JSON_BUILD_PAIR("uint32", SD_JSON_BUILD_UNSIGNED(0)),
|
||||
SD_JSON_BUILD_PAIR("uhex32", SD_JSON_BUILD_UNSIGNED(0)),
|
||||
SD_JSON_BUILD_PAIR("uint64", SD_JSON_BUILD_UNSIGNED(0)),
|
||||
SD_JSON_BUILD_PAIR("uhex64", SD_JSON_BUILD_UNSIGNED(0))),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint", 0),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint8", 0),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint16", 0),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint32", 0),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uhex32", 0),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint64", 0),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uhex64", 0)),
|
||||
SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("uint", SD_JSON_BUILD_UNSIGNED(UINT_MAX)),
|
||||
SD_JSON_BUILD_PAIR("uint8", SD_JSON_BUILD_UNSIGNED(UINT8_MAX)),
|
||||
SD_JSON_BUILD_PAIR("uint16", SD_JSON_BUILD_UNSIGNED(UINT16_MAX)),
|
||||
SD_JSON_BUILD_PAIR("uint32", SD_JSON_BUILD_UNSIGNED(UINT32_MAX)),
|
||||
SD_JSON_BUILD_PAIR("uhex32", SD_JSON_BUILD_UNSIGNED(UINT32_MAX)),
|
||||
SD_JSON_BUILD_PAIR("uint64", SD_JSON_BUILD_UNSIGNED(UINT64_MAX)),
|
||||
SD_JSON_BUILD_PAIR("uhex64", SD_JSON_BUILD_UNSIGNED(UINT64_MAX))))));
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint", UINT_MAX),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint8", UINT8_MAX),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint16", UINT16_MAX),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint32", UINT32_MAX),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uhex32", UINT32_MAX),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uint64", UINT64_MAX),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("uhex64", UINT64_MAX)))));
|
||||
sd_json_variant_dump(b, SD_JSON_FORMAT_NEWLINE, stdout, NULL);
|
||||
|
||||
ASSERT_TRUE(sd_json_variant_equal(a, b));
|
||||
@@ -734,10 +734,10 @@ TEST(vertical) {
|
||||
ASSERT_OK(table_to_json(t, &a));
|
||||
|
||||
ASSERT_OK(sd_json_build(&b, SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("pfft_aa", SD_JSON_BUILD_STRING("foo")),
|
||||
SD_JSON_BUILD_PAIR("dimpfelmoser", SD_JSON_BUILD_UNSIGNED(1024)),
|
||||
SD_JSON_BUILD_PAIR("custom-quux", SD_JSON_BUILD_STRING("asdf")),
|
||||
SD_JSON_BUILD_PAIR("lllllllllllo", SD_JSON_BUILD_STRING("jjjjjjjjjjjjjjjjj")))));
|
||||
SD_JSON_BUILD_PAIR_STRING("pfft_aa", "foo"),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("dimpfelmoser", 1024),
|
||||
SD_JSON_BUILD_PAIR_STRING("custom-quux", "asdf"),
|
||||
SD_JSON_BUILD_PAIR_STRING("lllllllllllo", "jjjjjjjjjjjjjjjjj"))));
|
||||
|
||||
ASSERT_TRUE(sd_json_variant_equal(a, b));
|
||||
}
|
||||
|
||||
@@ -334,8 +334,8 @@ TEST(validate_json) {
|
||||
_cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
|
||||
|
||||
assert_se(sd_json_build(&v, SD_JSON_BUILD_OBJECT(
|
||||
SD_JSON_BUILD_PAIR("a", SD_JSON_BUILD_STRING("x")),
|
||||
SD_JSON_BUILD_PAIR("b", SD_JSON_BUILD_UNSIGNED(44)),
|
||||
SD_JSON_BUILD_PAIR_STRING("a", "x"),
|
||||
SD_JSON_BUILD_PAIR_UNSIGNED("b", 44),
|
||||
SD_JSON_BUILD_PAIR("d", SD_JSON_BUILD_ARRAY(SD_JSON_BUILD_UNSIGNED(5), SD_JSON_BUILD_UNSIGNED(7), SD_JSON_BUILD_UNSIGNED(107))),
|
||||
SD_JSON_BUILD_PAIR("g", SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("f", SD_JSON_BUILD_REAL(0.5f)))))) >= 0);
|
||||
|
||||
|
||||
+13
-13
@@ -45,7 +45,7 @@ static int method_something(sd_varlink *link, sd_json_variant *parameters, sd_va
|
||||
|
||||
y = sd_json_variant_integer(b);
|
||||
|
||||
r = sd_json_build(&ret, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("sum", SD_JSON_BUILD_INTEGER(x + y))));
|
||||
r = sd_json_build(&ret, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("sum", x + y)));
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -75,7 +75,7 @@ static int method_something_more(sd_varlink *link, sd_json_variant *parameters,
|
||||
for (int i = 0; i < 5; i++) {
|
||||
_cleanup_(sd_json_variant_unrefp) sd_json_variant *w = NULL;
|
||||
|
||||
r = sd_json_build(&w, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("sum", SD_JSON_BUILD_INTEGER(s.x + (s.y * i)))));
|
||||
r = sd_json_build(&w, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("sum", s.x + (s.y * i))));
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -84,7 +84,7 @@ static int method_something_more(sd_varlink *link, sd_json_variant *parameters,
|
||||
return r;
|
||||
}
|
||||
|
||||
r = sd_json_build(&ret, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("sum", SD_JSON_BUILD_INTEGER(s.x + (s.y * 5)))));
|
||||
r = sd_json_build(&ret, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("sum", s.x + (s.y * 5))));
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -125,7 +125,7 @@ static int method_passfd(sd_varlink *link, sd_json_variant *parameters, sd_varli
|
||||
ASSERT_OK(vv = memfd_new_and_seal_string("data", "miau"));
|
||||
ASSERT_OK(ww = memfd_new_and_seal_string("data", "wuff"));
|
||||
|
||||
r = sd_json_build(&ret, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("yo", SD_JSON_BUILD_INTEGER(88))));
|
||||
r = sd_json_build(&ret, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("yo", 88)));
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -222,7 +222,7 @@ static void flood_test(const char *address) {
|
||||
ASSERT_OK(asprintf(&t, "flood-%zu", k));
|
||||
ASSERT_OK(sd_varlink_set_description(connections[k], t));
|
||||
ASSERT_OK(sd_varlink_attach_event(connections[k], e, k));
|
||||
ASSERT_OK(sd_varlink_sendb(connections[k], "io.test.Rubbish", SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("id", SD_JSON_BUILD_INTEGER(k)))));
|
||||
ASSERT_OK(sd_varlink_sendb(connections[k], "io.test.Rubbish", SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("id", k))));
|
||||
}
|
||||
|
||||
/* Then, create one more, which should fail */
|
||||
@@ -253,8 +253,8 @@ static void *thread(void *arg) {
|
||||
const char *error_id, *e;
|
||||
int x = 0;
|
||||
|
||||
ASSERT_OK(sd_json_build(&i, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("a", SD_JSON_BUILD_INTEGER(88)),
|
||||
SD_JSON_BUILD_PAIR("b", SD_JSON_BUILD_INTEGER(99)))));
|
||||
ASSERT_OK(sd_json_build(&i, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("a", 88),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("b", 99))));
|
||||
|
||||
ASSERT_OK(sd_varlink_connect_address(&c, arg));
|
||||
ASSERT_OK(sd_varlink_set_description(c, "thread-client"));
|
||||
@@ -262,8 +262,8 @@ static void *thread(void *arg) {
|
||||
ASSERT_OK(sd_varlink_set_allow_fd_passing_output(c, true));
|
||||
|
||||
/* Test that client is able to perform two sequential sd_varlink_collect calls if first resulted in an error */
|
||||
ASSERT_OK(sd_json_build(&wrong, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("a", SD_JSON_BUILD_INTEGER(88)),
|
||||
SD_JSON_BUILD_PAIR("c", SD_JSON_BUILD_INTEGER(99)))));
|
||||
ASSERT_OK(sd_json_build(&wrong, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("a", 88),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("c", 99))));
|
||||
ASSERT_OK(sd_varlink_collect(c, "io.test.DoSomethingMore", wrong, &j, &error_id));
|
||||
ASSERT_STREQ(error_id, "org.varlink.service.InvalidParameter");
|
||||
|
||||
@@ -292,7 +292,7 @@ static void *thread(void *arg) {
|
||||
ASSERT_OK_EQ(sd_varlink_push_fd(c, fd2), 1);
|
||||
ASSERT_OK_EQ(sd_varlink_push_fd(c, fd3), 2);
|
||||
|
||||
ASSERT_OK(sd_varlink_callb(c, "io.test.PassFD", &o, &e, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("fd", SD_JSON_BUILD_STRING("whoop")))));
|
||||
ASSERT_OK(sd_varlink_callb(c, "io.test.PassFD", &o, &e, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_STRING("fd", "whoop"))));
|
||||
ASSERT_NULL(e);
|
||||
|
||||
int fd4, fd5;
|
||||
@@ -302,7 +302,7 @@ static void *thread(void *arg) {
|
||||
test_fd(fd4, "miau", 4);
|
||||
test_fd(fd5, "wuff", 4);
|
||||
|
||||
ASSERT_OK(sd_varlink_callb(c, "io.test.PassFD", &o, &e, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("fdx", SD_JSON_BUILD_STRING("whoopx")))));
|
||||
ASSERT_OK(sd_varlink_callb(c, "io.test.PassFD", &o, &e, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_STRING("fdx", "whoopx"))));
|
||||
ASSERT_TRUE(sd_varlink_error_is_invalid_parameter(e, o, "fd"));
|
||||
|
||||
ASSERT_OK(sd_varlink_callb(c, "io.test.IDontExist", &o, &e, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("x", SD_JSON_BUILD_REAL(5.5)))));
|
||||
@@ -371,8 +371,8 @@ TEST(chat) {
|
||||
ASSERT_OK(sd_varlink_server_attach_event(s, e, 0));
|
||||
ASSERT_OK(sd_varlink_server_set_connections_max(s, OVERLOAD_CONNECTIONS));
|
||||
|
||||
ASSERT_OK(sd_json_build(&v, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("a", SD_JSON_BUILD_INTEGER(7)),
|
||||
SD_JSON_BUILD_PAIR("b", SD_JSON_BUILD_INTEGER(22)))));
|
||||
ASSERT_OK(sd_json_build(&v, SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_INTEGER("a", 7),
|
||||
SD_JSON_BUILD_PAIR_INTEGER("b", 22))));
|
||||
|
||||
ASSERT_OK(sd_varlink_connect_address(&c, sp));
|
||||
ASSERT_OK(sd_varlink_set_description(c, "main-client"));
|
||||
|
||||
Reference in New Issue
Block a user