core: convert PID 1 to libsystemd-bus

[elogind.git] / src / libsystemd-bus / test-bus-marshal.c

diff --git a/src/libsystemd-bus/test-bus-marshal.c b/src/libsystemd-bus/test-bus-marshal.c
index ae61476d57d989eb5921f33f4137b62b10557e00..b7606d7708dca920cb2fdecde029f2e85647bbe7 100644 (file)
--- a/src/libsystemd-bus/test-bus-marshal.c
+++ b/src/libsystemd-bus/test-bus-marshal.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_DBUS
-#include <dbus.h>
+#include <dbus/dbus.h>
 #endif
 
 #include "log.h"
@@ -37,11 +37,12 @@
 #include "sd-bus.h"
 #include "bus-message.h"
 #include "bus-util.h"
+#include "bus-dump.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *copy = NULL;
         int r, boolean;
-        const char *x, *y, *z, *a, *b, *c, *d;
+        const char *x, *x2, *y, *z, *a, *b, *c, *d;
         uint8_t u, v;
         void *buffer = NULL;
         size_t sz;
@@ -59,7 +60,7 @@ int main(int argc, char *argv[]) {
         assert_se(r >= 0);
 
         r = sd_bus_message_append(m, "s", NULL);
-        assert_se(r < 0);
+        assert_se(r >= 0);
 
         r = sd_bus_message_append(m, "as", 2, "string #1", "string #2");
         assert_se(r >= 0);
@@ -92,6 +93,9 @@ int main(int argc, char *argv[]) {
         r = sd_bus_message_append_array(m, 'i', integer_array, sizeof(integer_array));
         assert_se(r >= 0);
 
+        r = sd_bus_message_append_array(m, 'u', NULL, 0);
+        assert_se(r >= 0);
+
         r = bus_message_seal(m, 4711);
         assert_se(r >= 0);
 
@@ -160,9 +164,10 @@ int main(int argc, char *argv[]) {
 
         assert_se(sd_bus_message_rewind(m, true) >= 0);
 
-        r = sd_bus_message_read(m, "sas", &x, 2, &y, &z);
+        r = sd_bus_message_read(m, "ssas", &x, &x2, 2, &y, &z);
         assert_se(r > 0);
         assert_se(streq(x, "a string"));
+        assert_se(streq(x2, ""));
         assert_se(streq(y, "string #1"));
         assert_se(streq(z, "string #2"));
 
@@ -209,6 +214,10 @@ int main(int argc, char *argv[]) {
         assert_se(sz == sizeof(integer_array));
         assert_se(memcmp(integer_array, return_array, sz) == 0);
 
+        r = sd_bus_message_read_array(m, 'u', (const void**) &return_array, &sz);
+        assert_se(r > 0);
+        assert_se(sz == 0);
+
         r = sd_bus_message_peek_type(m, NULL, NULL);
         assert_se(r == 0);
 
@@ -241,7 +250,7 @@ int main(int argc, char *argv[]) {
 
         assert_se(sd_bus_message_verify_type(m, 's', NULL) > 0);
 
-        r = sd_bus_message_skip(m, "sas");
+        r = sd_bus_message_skip(m, "ssas");
         assert_se(r > 0);
 
         assert_se(sd_bus_message_verify_type(m, 's', NULL) > 0);