commit 7802c074960a1707f7b5311a14b018918a71e63e
author Patrick Williams <patrick@stwcx.xyz> Fri Sep 02 15:20:22 2016 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Sep 12 21:54:52 2016 -0500
tree 5126a7bf53cc1a68b830ff041bf747ca1bbfc009
parent 5acb5492ea449c147b49d5c3113473175f1454c2

Migrate bus to message bindings

Change-Id: I29a03b146d5c050a13b4bab690d450612797f2ce
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

test/message/append.cpp

diff --git a/test/message/append.cpp b/test/message/append.cpp
index c9c2e47..1cc56ff 100644
--- a/test/message/append.cpp
+++ b/test/message/append.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <sdbusplus/message/append.hpp>
 #include <cassert>
+#include <sdbusplus/message.hpp>
 #include <sdbusplus/bus.hpp>
 
 // Global to share the dbus type string between client and server.
@@ -53,66 +53,66 @@
     }
 }
 
-void newMethodCall__test(sdbusplus::bus::bus& b, sd_bus_message** m)
+auto newMethodCall__test(sdbusplus::bus::bus& b)
 {
     // Allocate a method-call message for INTERFACE,TEST_METHOD.
-    *m = b.new_method_call(SERVICE, "/", INTERFACE, TEST_METHOD);
+    return b.new_method_call(SERVICE, "/", INTERFACE, TEST_METHOD);
 }
 
 void runTests()
 {
     using namespace std::literals;
 
-    sd_bus_message* m = nullptr;
     auto b = sdbusplus::bus::new_default();
 
     // Test r-value int.
     {
-        newMethodCall__test(b, &m);
-        sdbusplus::message::append(m, 1);
+        auto m = newMethodCall__test(b);
+        m.append(1);
         verifyTypeString = "i";
         b.call_noreply(m);
     }
-
     // Test l-value int.
     {
-        newMethodCall__test(b, &m);
+        auto m = newMethodCall__test(b);
         int a = 1;
-        sdbusplus::message::append(m, a, a);
+        m.append(a, a);
         verifyTypeString = "ii";
         b.call_noreply(m);
     }
 
     // Test multiple ints.
     {
-        newMethodCall__test(b, &m);
-        sdbusplus::message::append(m, 1, 2, 3, 4, 5);
+        auto m = newMethodCall__test(b);
+        m.append(1, 2, 3, 4, 5);
         verifyTypeString = "iiiii";
         b.call_noreply(m);
     }
 
     // Test r-value string.
     {
-        newMethodCall__test(b, &m);
-        sdbusplus::message::append(m, "asdf"s);
+        auto m = newMethodCall__test(b);
+        m.append("asdf"s);
         verifyTypeString = "s";
         b.call_noreply(m);
     }
 
     // Test multiple strings, various forms.
     {
-        newMethodCall__test(b, &m);
+        auto m = newMethodCall__test(b);
         auto str = "jkl;"s;
         auto str2 = "JKL:"s;
-        sdbusplus::message::append(m, 1, "asdf", "ASDF"s, str,
-                                   std::move(str2), 5);
+        m.append(1, "asdf", "ASDF"s, str,
+                 std::move(str2), 5);
         verifyTypeString = "issssi";
         b.call_noreply(m);
     }
 
     // Shutdown server.
-    m = b.new_method_call(SERVICE, "/", INTERFACE, QUIT_METHOD);
-    b.call_noreply(m);
+    {
+        auto m = b.new_method_call(SERVICE, "/", INTERFACE, QUIT_METHOD);
+        b.call_noreply(m);
+    }
 }
 
 int main()