Merge lp:~thomas-voss/dbus-cpp/fix-1524131 into lp:dbus-cpp/15.04

[Thomas Voß]

Add a proper operator<< for dbus::Message::Type.

Add a proper operator<< for dbus::Message::Type.

[Alberto Aguirre (albaguirre)]

LGTM.

review: Approve

[lp:~thomas-voss/dbus-cpp/fix-1524131]

108. By Thomas Voß on 2016-01-14

Adjust symbols files to account for newly added symbol.

[Alberto Aguirre (albaguirre)]

Tested video playback as described in https://bugs.launchpad.net/ubuntu/+source/mediaplayer-app/+bug/1524131/comments/2

No more crashes.

=== modified file 'debian/libdbus-cpp4.symbols.32bit'
--- debian/libdbus-cpp4.symbols.32bit	2015-05-05 08:24:50 +0000
+++ debian/libdbus-cpp4.symbols.32bit	2016-01-14 21:37:26 +0000
@@ -1,3 +1,4 @@
+ (c++)"core::dbus::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::dbus::Message::Type)@Base" 0replaceme
  (c++)"core::dbus::Fixture::system_bus_address()@Base" 4.3.0+15.04.20150505
  (c++)"core::dbus::Fixture::session_bus_address()@Base" 4.3.0+15.04.20150505
  (c++)"core::dbus::Fixture::default_daemon_timeout()@Base" 4.0.0+14.10.20140730

=== modified file 'debian/libdbus-cpp4.symbols.64bit'
--- debian/libdbus-cpp4.symbols.64bit	2015-05-05 08:24:50 +0000
+++ debian/libdbus-cpp4.symbols.64bit	2016-01-14 21:37:26 +0000
@@ -1,3 +1,4 @@
+ (c++)"core::dbus::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::dbus::Message::Type)@Base" 0replaceme
  (c++)"core::dbus::Fixture::system_bus_address()@Base" 4.3.0+15.04.20150505
  (c++)"core::dbus::Fixture::session_bus_address()@Base" 4.3.0+15.04.20150505
  (c++)"core::dbus::Fixture::default_daemon_timeout()@Base" 4.0.0+14.10.20140730

=== modified file 'include/core/dbus/message.h'
--- include/core/dbus/message.h	2014-01-05 18:58:19 +0000
+++ include/core/dbus/message.h	2016-01-14 21:37:26 +0000
@@ -439,6 +439,8 @@
 };
 typedef std::shared_ptr<Message> MessagePtr;
 typedef std::unique_ptr<Message> MessageUPtr;
+
+ORG_FREEDESKTOP_DBUS_DLL_PUBLIC std::ostream& operator<<(std::ostream&, Message::Type);
 }
 }
 

=== modified file 'src/core/dbus/match_rule.cpp'
--- src/core/dbus/match_rule.cpp	2014-01-21 13:48:54 +0000
+++ src/core/dbus/match_rule.cpp	2016-01-14 21:37:26 +0000
@@ -151,17 +151,10 @@
 
 std::string dbus::MatchRule::as_string() const
 {
-    static const std::map<Message::Type, std::string> lut =
-    {
-        {Message::Type::signal, "signal"},
-        {Message::Type::method_call, "method_call"},
-        {Message::Type::method_return, "method_return"},
-        {Message::Type::error, "error"}
-    };
     Comma comma;
     std::stringstream ss;
     if (d->type != Message::Type::invalid)
-        ss << "type='" << lut.at(d->type) << "'" << comma;
+        ss << "type='" << d->type << "'" << comma;
     if (!d->sender.empty())
         ss << comma << "sender='" << d->sender << "'" << comma;
     if (!d->interface.empty())

=== modified file 'src/core/dbus/message.cpp'
--- src/core/dbus/message.cpp	2015-07-21 18:30:23 +0000
+++ src/core/dbus/message.cpp	2016-01-14 21:37:26 +0000
@@ -652,5 +652,24 @@
 {
     return std::shared_ptr<Message>(new Message(d->clone()));
 }
+
+std::ostream& operator<<(std::ostream& out, Message::Type type)
+{
+    switch (type)
+    {
+    case Message::Type::error:
+        return out << "error";
+    case Message::Type::invalid:
+        return out << "invalid";
+    case Message::Type::method_call:
+        return out << "method_call";
+    case Message::Type::method_return:
+        return out << "method_return";
+    case Message::Type::signal:
+        return out << "signal";
+    }
+
+    return out;
+}
 }
 }

=== modified file 'tests/message_test.cpp'
--- tests/message_test.cpp	2014-01-10 07:34:59 +0000
+++ tests/message_test.cpp	2016-01-14 21:37:26 +0000
@@ -175,3 +175,23 @@
         }
     }
 }
+
+namespace
+{
+class MessageType : public testing::TestWithParam<std::pair<core::dbus::Message::Type, std::string>>
+{
+};
+}
+
+TEST_P(MessageType, IsPrintedCorrectly)
+{
+    std::stringstream ss; ss << GetParam().first;
+    EXPECT_EQ(GetParam().second, ss.str());
+}
+
+INSTANTIATE_TEST_CASE_P(MessageType, MessageType, ::testing::Values(
+                            std::make_pair(core::dbus::Message::Type::error, "error"),
+                            std::make_pair(core::dbus::Message::Type::invalid, "invalid"),
+                            std::make_pair(core::dbus::Message::Type::method_call, "method_call"),
+                            std::make_pair(core::dbus::Message::Type::method_return, "method_return"),
+                            std::make_pair(core::dbus::Message::Type::signal, "signal")));