Merge lp:~thomas-voss/dbus-cpp/add_fixture_for_testing_purposes into lp:dbus-cpp

[Thomas Voß]

Add fixture for testing purposes.

Add fixture for testing purposes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/28/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/49/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/dbus-cpp/add_fixture_for_testing_purposes]

25. By Thomas Voß on 2014-01-10

Remove two obsolete sleeps.
Remove two obsolete std::cout's.

26. By Thomas Voß on 2014-01-10

Adjust i386 symbols file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/50/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/dbus-cpp/add_fixture_for_testing_purposes]

27. By Thomas Voß on 2014-01-13

Clean up indentation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/51/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-27 18:57:42 +0000
+++ CMakeLists.txt	2014-01-13 07:51:24 +0000
@@ -20,6 +20,10 @@
 
 find_package(Boost COMPONENTS filesystem program_options system REQUIRED)
 find_package(LibXml2 REQUIRED)
+find_package(PkgConfig REQUIRED)
+
+pkg_check_modules(DBUS dbus-1)
+pkg_check_modules(PROCESS_CPP process-cpp)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-11-04 15:33:03 +0000
+++ data/CMakeLists.txt	2014-01-13 07:51:24 +0000
@@ -23,3 +23,9 @@
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
+install(
+  FILES ${CMAKE_CURRENT_SOURCE_DIR}/session.conf ${CMAKE_CURRENT_SOURCE_DIR}/system.conf
+  DESTINATION
+  "${CMAKE_INSTALL_DATADIR}/dbus-cpp/"
+)
+

=== added file 'data/session.conf'
--- data/session.conf	1970-01-01 00:00:00 +0000
+++ data/session.conf	2014-01-13 07:51:24 +0000
@@ -0,0 +1,42 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- If we fork, keep the user's original umask to avoid affecting
+       the behavior of child processes. -->
+  <keep_umask/>
+
+  <type>session</type>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <standard_session_servicedirs />
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*" eavesdrop="true"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+  <!-- raise the service start timeout to 40 seconds as it can timeout
+       on the live cd on slow machines -->
+  <limit name="service_start_timeout">60000</limit>
+
+  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
+  <limit name="max_incoming_bytes">1000000000</limit>
+  <limit name="max_outgoing_bytes">1000000000</limit>
+  <limit name="max_message_size">1000000000</limit>
+  <limit name="service_start_timeout">120000</limit>  
+  <limit name="auth_timeout">240000</limit>
+  <limit name="max_completed_connections">100000</limit>  
+  <limit name="max_incomplete_connections">10000</limit>
+  <limit name="max_connections_per_user">100000</limit>
+  <limit name="max_pending_service_starts">10000</limit>
+  <limit name="max_names_per_connection">50000</limit>
+  <limit name="max_match_rules_per_connection">50000</limit>
+  <limit name="max_replies_per_connection">50000</limit>
+  <limit name="reply_timeout">300000</limit>
+
+</busconfig>

=== added file 'data/system.conf'
--- data/system.conf	1970-01-01 00:00:00 +0000
+++ data/system.conf	2014-01-13 07:51:24 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- If we fork, keep the user's original umask to avoid affecting
+       the behavior of child processes. -->
+  <keep_umask/>
+
+  <type>system</type>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <standard_system_servicedirs/>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*" eavesdrop="true"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+</busconfig>

=== modified file 'debian/control'
--- debian/control	2014-01-03 07:35:26 +0000
+++ debian/control	2014-01-13 07:51:24 +0000
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
-               dbus-test-runner,
+               dbus,
                debhelper (>= 9),
                doxygen,
                google-mock,

=== modified file 'debian/libdbus-cpp1.symbols.amd64'
--- debian/libdbus-cpp1.symbols.amd64	2014-01-05 18:58:19 +0000
+++ debian/libdbus-cpp1.symbols.amd64	2014-01-13 07:51:24 +0000
@@ -304,7 +304,6 @@
  (c++)"std::__detail::_Hash_node<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, true>* std::_Hashtable<core::dbus::types::ObjectPath, std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::types::ObjectPath>, std::hash<core::dbus::types::ObjectPath>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::_M_allocate_node<std::piecewise_construct_t const&, std::tuple<core::dbus::types::ObjectPath const&>, std::tuple<> >(std::piecewise_construct_t const&, std::tuple<core::dbus::types::ObjectPath const&>&&, std::tuple<>&&)@Base" 0replaceme
  (c++)"std::__detail::_Hash_node<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, true>* std::_Hashtable<core::dbus::types::ObjectPath, std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::types::ObjectPath>, std::hash<core::dbus::types::ObjectPath>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::_M_allocate_node<std::piecewise_construct_t const&, std::tuple<core::dbus::types::ObjectPath const&>, std::tuple<> >(std::piecewise_construct_t const&, std::tuple<core::dbus::types::ObjectPath const&>&&, std::tuple<>&&)@Base" 0replaceme
  (c++)"std::_Hashtable<core::dbus::types::ObjectPath, std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::types::ObjectPath>, std::hash<core::dbus::types::ObjectPath>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::_M_insert_unique_node(unsigned long, unsigned long, std::__detail::_Hash_node<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, true>*)@Base" 0replaceme
- (c++)"std::_Hashtable<core::dbus::types::ObjectPath, std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::types::ObjectPath>, std::hash<core::dbus::types::ObjectPath>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::clear()@Base" 0replaceme
  (c++)"std::_Hashtable<core::dbus::types::ObjectPath, std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::types::ObjectPath>, std::hash<core::dbus::types::ObjectPath>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::_M_rehash(unsigned long, unsigned long const&)@Base" 0replaceme
  (c++)"std::_Hashtable<core::dbus::Message::Type, std::pair<core::dbus::Message::Type const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::Message::Type const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::Message::Type>, std::hash<core::dbus::Message::Type>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::_M_rehash_aux(unsigned long, std::integral_constant<bool, true>)@Base" 0replaceme
  (c++)"std::_Hashtable<core::dbus::Message::Type, std::pair<core::dbus::Message::Type const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::Message::Type const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::Message::Type>, std::hash<core::dbus::Message::Type>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::_M_insert_unique_node(unsigned long, unsigned long, std::__detail::_Hash_node<std::pair<core::dbus::Message::Type const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, true>*)@Base" 0replaceme
@@ -352,6 +351,46 @@
  (c++)"typeinfo for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
  (c++)"typeinfo name for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
  (c++)"vtable for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"guard variable for core::dbus::DBus::Hello::name()::s@Base" 0replaceme
+ (c++)"core::dbus::Bus::Bus(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Bus::Bus(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::create_connection_to_system_bus()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::create_connection_to_session_bus()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::Fixture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::Fixture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::DBus::hello() const@Base" 0replaceme
+ (c++)"std::_Function_base::_Base_manager<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_manager(std::_Any_data&, std::_Function_base::_Base_manager<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}> const&, std::_Manager_operation)@Base" 0replaceme
+ (c++)"std::_Function_base::_Base_manager<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_manager(std::_Any_data&, std::_Function_base::_Base_manager<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}> const&, std::_Manager_operation)@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_dispose()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_get_deleter(std::type_info const&)@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Function_handler<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_invoke(std::_Any_data const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::_Function_handler<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_invoke(std::_Any_data const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >::~pair()@Base" 0replaceme
+ (c++)"std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >::~pair()@Base" 0replaceme
+ (c++)"std::_Rb_tree_iterator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_insert_<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&&)@Base" 0replaceme
+ (c++)"std::pair<std::_Rb_tree_iterator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, bool> std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_insert_unique<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&&)@Base" 0replaceme
+ (c++)"std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture@Base" 0replaceme
+ (c++)"typeinfo for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture@Base" 0replaceme
+ (c++)"typeinfo name for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"vtable for core::dbus::Fixture@Base" 0replaceme
+ (c++)"vtable for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"core::dbus::DBus::Hello::name()::s@Base" 0replaceme
+ (c++)"core::dbus::Fixture::default_system_bus_config_file()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::default_session_bus_config_file()@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<boost::system::system_error>::error_info_injector(boost::exception_detail::error_info_injector<boost::system::system_error> const&)@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<boost::system::system_error>::error_info_injector(boost::exception_detail::error_info_injector<boost::system::system_error> const&)@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<std::runtime_error>::error_info_injector(boost::exception_detail::error_info_injector<std::runtime_error> const&)@Base" 0replaceme
@@ -362,3 +401,4 @@
  (c++|optional)"std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::operator+<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)@Base" 0replaceme
  (c++|optional)"std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::operator+<char, std::char_traits<char>, std::allocator<char> >(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++|optional)"std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::operator+<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@Base" 0replaceme
+ (c++|optional)"std::_Hashtable<core::dbus::types::ObjectPath, std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> >, std::allocator<std::pair<core::dbus::types::ObjectPath const, std::function<void (std::shared_ptr<core::dbus::Message> const&)> > >, std::__detail::_Select1st, std::equal_to<core::dbus::types::ObjectPath>, std::hash<core::dbus::types::ObjectPath>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::clear()@Base" 0replaceme

=== modified file 'debian/libdbus-cpp1.symbols.armhf'
--- debian/libdbus-cpp1.symbols.armhf	2014-01-05 18:58:19 +0000
+++ debian/libdbus-cpp1.symbols.armhf	2014-01-13 07:51:24 +0000
@@ -378,6 +378,50 @@
  (c++)"typeinfo for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
  (c++)"typeinfo name for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
  (c++)"vtable for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"guard variable for core::dbus::DBus::Hello::name()::s@Base" 0replaceme
+ (c++)"core::dbus::Bus::Bus(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Bus::Bus(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::default_system_bus_config_file()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::create_connection_to_system_bus()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::default_session_bus_config_file()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::create_connection_to_session_bus()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::Fixture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::Fixture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::DBus::hello() const@Base" 0replaceme
+ (c++)"std::_Function_base::_Base_manager<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_manager(std::_Any_data&, std::_Function_base::_Base_manager<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}> const&, std::_Manager_operation)@Base" 0replaceme
+ (c++)"std::_Function_base::_Base_manager<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_manager(std::_Any_data&, std::_Function_base::_Base_manager<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}> const&, std::_Manager_operation)@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_dispose()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_get_deleter(std::type_info const&)@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Function_handler<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_invoke(std::_Any_data const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::_Function_handler<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_invoke(std::_Any_data const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >::~pair()@Base" 0replaceme
+ (c++)"std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >::~pair()@Base" 0replaceme
+ (c++)"std::_Rb_tree_iterator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_insert_<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&&)@Base" 0replaceme
+ (c++)"std::pair<std::_Rb_tree_iterator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, bool> std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_insert_unique<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&&)@Base" 0replaceme
+ (c++)"std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture@Base" 0replaceme
+ (c++)"typeinfo for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture@Base" 0replaceme
+ (c++)"typeinfo name for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"vtable for core::dbus::Fixture@Base" 0replaceme
+ (c++)"vtable for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"core::dbus::DBus::Hello::name()::s@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<boost::system::system_error>::error_info_injector(boost::exception_detail::error_info_injector<boost::system::system_error> const&)@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<boost::system::system_error>::error_info_injector(boost::exception_detail::error_info_injector<boost::system::system_error> const&)@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<std::runtime_error>::error_info_injector(boost::exception_detail::error_info_injector<std::runtime_error> const&)@Base" 0replaceme

=== modified file 'debian/libdbus-cpp1.symbols.i386'
--- debian/libdbus-cpp1.symbols.i386	2014-01-05 18:58:19 +0000
+++ debian/libdbus-cpp1.symbols.i386	2014-01-13 07:51:24 +0000
@@ -378,6 +378,50 @@
  (c++)"typeinfo for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
  (c++)"typeinfo name for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
  (c++)"vtable for std::_Sp_counted_ptr<core::dbus::Message::Reader::Private*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"guard variable for core::dbus::DBus::Hello::name()::s@Base" 0replaceme
+ (c++)"core::dbus::Bus::Bus(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Bus::Bus(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::default_system_bus_config_file()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::create_connection_to_system_bus()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::default_session_bus_config_file()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::create_connection_to_session_bus()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::Fixture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::Fixture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::Fixture::~Fixture()@Base" 0replaceme
+ (c++)"core::dbus::DBus::hello() const@Base" 0replaceme
+ (c++)"std::_Function_base::_Base_manager<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_manager(std::_Any_data&, std::_Function_base::_Base_manager<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}> const&, std::_Manager_operation)@Base" 0replaceme
+ (c++)"std::_Function_base::_Base_manager<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_manager(std::_Any_data&, std::_Function_base::_Base_manager<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}> const&, std::_Manager_operation)@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_dispose()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::_M_get_deleter(std::type_info const&)@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr()@Base" 0replaceme
+ (c++)"std::_Function_handler<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_invoke(std::_Any_data const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::_Function_handler<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}>::_M_invoke(std::_Any_data const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >::~pair()@Base" 0replaceme
+ (c++)"std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >::~pair()@Base" 0replaceme
+ (c++)"std::_Rb_tree_iterator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_insert_<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&&)@Base" 0replaceme
+ (c++)"std::pair<std::_Rb_tree_iterator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, bool> std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_insert_unique<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&&)@Base" 0replaceme
+ (c++)"std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"std::_Rb_tree<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::function<core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}, void>(core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1})@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture@Base" 0replaceme
+ (c++)"typeinfo for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo for core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture@Base" 0replaceme
+ (c++)"typeinfo name for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture::Private::System::System(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"typeinfo name for core::dbus::Fixture::Private::Session::Session(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)::{lambda(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)#1}@Base" 0replaceme
+ (c++)"vtable for core::dbus::Fixture@Base" 0replaceme
+ (c++)"vtable for std::_Sp_counted_ptr<core::dbus::Bus*, (__gnu_cxx::_Lock_policy)2>@Base" 0replaceme
+ (c++)"core::dbus::DBus::Hello::name()::s@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<boost::system::system_error>::error_info_injector(boost::exception_detail::error_info_injector<boost::system::system_error> const&)@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<boost::system::system_error>::error_info_injector(boost::exception_detail::error_info_injector<boost::system::system_error> const&)@Base" 0replaceme
  (c++|optional)"boost::exception_detail::error_info_injector<std::runtime_error>::error_info_injector(boost::exception_detail::error_info_injector<std::runtime_error> const&)@Base" 0replaceme

=== modified file 'include/core/dbus/bus.h'
--- include/core/dbus/bus.h	2013-11-27 18:57:42 +0000
+++ include/core/dbus/bus.h	2014-01-13 07:51:24 +0000
@@ -172,6 +172,12 @@
     typedef std::function<MessageHandlerResult(const Message::Ptr& msg)> MessageHandler;
 
     /**
+     * @brief Constructs an instance of Bus and connected to the bus specified by address.
+     * @param address The address of the bus to connect to.
+     */
+    explicit Bus(const std::string& address);
+
+    /**
      * @brief Creates a connection to a well-known bus. The implementation takes care of setting up thread-safety flags for DBus.
      * @param bus The well-known bus the instance should connect to.
      */

=== modified file 'include/core/dbus/dbus.h'
--- include/core/dbus/dbus.h	2013-11-28 08:48:17 +0000
+++ include/core/dbus/dbus.h	2014-01-13 07:51:24 +0000
@@ -18,19 +18,23 @@
 #ifndef CORE_DBUS_DBUS_H_
 #define CORE_DBUS_DBUS_H_
 
-#include <core/dbus/bus.h>
-#include <core/dbus/codec.h>
-#include <core/dbus/object.h>
-#include <core/dbus/service.h>
 #include <core/dbus/visibility.h>
-#include <core/dbus/types/object_path.h>
 
-#include <sstream>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace core
 {
 namespace dbus
 {
+class Bus;
+class Object;
+class Service;
+namespace types
+{
+class ObjectPath;
+}
 /**
  * @brief The DBus class provides access to dbus daemon on the bus.
  */
@@ -46,7 +50,7 @@
     /** @brief Query the interface name of the DBus daemon. */
     static const std::string& interface();
 
-    DBus(const Bus::Ptr& bus);
+    DBus(const std::shared_ptr<Bus>& bus);
     DBus(const DBus&) = delete;
 
     DBus& operator=(const DBus&) = delete;
@@ -57,29 +61,36 @@
      * @param [in] name Name of the remote peer.
      * @return The process id of the remote peer.
      */
-    ORG_FREEDESKTOP_DBUS_DLL_PUBLIC uint32_t get_connection_unix_process_id(const std::string& name) const;
+    uint32_t get_connection_unix_process_id(const std::string& name) const;
 
     /**
      * @brief Queries the user ID given a name on the bus.
      * @param [in] name Name of the remote peer.
      * @return The user id that the remote peer runs under.
      */
-    ORG_FREEDESKTOP_DBUS_DLL_PUBLIC uint32_t get_connection_unix_user(const std::string& name) const;
+    uint32_t get_connection_unix_user(const std::string& name) const;
+
+    /**
+      * @brief Say hello to the message bus daemon.
+      * @return The unique name assigned to this connection.
+      */
+    std::string hello() const;
 
     /**
       * @brief List all known names on the bus.
       * @return A vector of all known participants on the bus.
       */
-    ORG_FREEDESKTOP_DBUS_DLL_PUBLIC std::vector<std::string> list_names() const;
+    std::vector<std::string> list_names() const;
 
 private:
     struct ListNames;
+    struct Hello;
     struct GetConnectionUnixProcessID;
     struct GetConnectionUnixUser;
 
-    Bus::Ptr bus;
-    Service::Ptr service;
-    Object::Ptr object;
+    std::shared_ptr<Bus> bus;
+    std::shared_ptr<Service> service;
+    std::shared_ptr<Object> object;
 };
 }
 }

=== added file 'include/core/dbus/fixture.h'
--- include/core/dbus/fixture.h	1970-01-01 00:00:00 +0000
+++ include/core/dbus/fixture.h	2014-01-13 07:51:24 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef CORE_DBUS_FIXTURE_H_
+#define CORE_DBUS_FIXTURE_H_
+
+#include <core/dbus/visibility.h>
+
+#include <memory>
+#include <string>
+
+namespace core
+{
+namespace dbus
+{
+class Bus;
+
+/**
+ * @brief The Fixture class provides private session and system bus instances for testing purposes.
+ */
+class ORG_FREEDESKTOP_DBUS_DLL_PUBLIC Fixture
+{
+public:
+
+    /**
+     * @brief default_session_bus_config_file provides the filename of the default session
+     * bus configuration file.
+     */
+    static const std::string& default_session_bus_config_file();
+
+    /**
+     * @brief default_system_bus_config_file provides the filename of the default system
+     * bus configuration file.
+     */
+    static const std::string& default_system_bus_config_file();
+
+    /**
+     * @brief Constructs a fixture instance with the two given configuration files.
+     *
+     * Any test running within the scope of this fixture will access the private
+     * session- and system-bus instances setup by this class.
+     *
+     * @param session_bus_config_file Path to the session-bus configuration file.
+     * @param system_bus_config_file Path to the system-bus configuration file.
+     */
+    Fixture(const std::string& session_bus_config_file,
+            const std::string& system_bus_config_file);
+
+    virtual ~Fixture();
+
+    /**
+     * @brief create_connection_to_session_bus creates a new connection to the testing session bus instance.
+     */
+    std::shared_ptr<Bus> create_connection_to_session_bus();
+
+    /**
+     * @brief create_connection_to_system_bus creates a new connection to the testing system bus instance.
+     */
+    std::shared_ptr<Bus> create_connection_to_system_bus();
+
+private:
+    struct Private;
+    std::unique_ptr<Private> d;
+};
+}
+}
+
+#if defined(CORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)
+#include <gtest/gtest.h>
+namespace core
+{
+namespace dbus
+{
+namespace testing
+{
+/**
+ * @brief The Fixture class provides a Google Test fixture for running
+ * tests in a private dbus environment.
+ */
+class Fixture : public ::testing::Test
+{
+public:
+
+    /**
+     * @brief default_session_bus_config_file provides the filename of the default session
+     * bus configuration file.
+     */
+    inline static std::string& default_session_bus_config_file()
+    {
+        static std::string s{core::dbus::Fixture::default_session_bus_config_file()};
+        return s;
+    }
+
+    /**
+     * @brief default_system_bus_config_file provides the filename of the default system
+     * bus configuration file.
+     */
+    inline static std::string& default_system_bus_config_file()
+    {
+        static std::string s{core::dbus::Fixture::default_system_bus_config_file()};
+        return s;
+    }
+
+    /**
+     * @brief Constructs an instance and sets up connections to the private
+     * session and system bus.
+     *
+     * @throw std::runtime_error in case of issues.
+     */
+    inline Fixture() :
+        fixture(default_session_bus_config_file(),
+                default_system_bus_config_file())
+    {
+    }
+
+    /**
+     * @brief session_bus provides access to the private session bus.
+     */
+    inline std::shared_ptr<Bus> session_bus()
+    {
+        return fixture.create_connection_to_session_bus();
+    }
+
+    /**
+     * @brief system_bus provides access to the private system bus.
+     */
+    inline std::shared_ptr<Bus> system_bus()
+    {
+        return fixture.create_connection_to_system_bus();
+    }
+
+private:
+    core::dbus::Fixture fixture;
+};
+}
+}
+}
+#endif // CORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE
+#endif // CORE_DBUS_FIXTURE_H_

=== modified file 'include/core/dbus/impl/property.h'
--- include/core/dbus/impl/property.h	2014-01-05 18:58:19 +0000
+++ include/core/dbus/impl/property.h	2014-01-13 07:51:24 +0000
@@ -65,47 +65,46 @@
 
 template<typename PropertyType>
 std::shared_ptr<Property<PropertyType>>
-                                        Property<PropertyType>::make_property(
-                                            const std::shared_ptr<Object>& parent)
+Property<PropertyType>::make_property(const std::shared_ptr<Object>& parent)
 {
-                                        return std::shared_ptr<Property<PropertyType>>(
-                                                                                          new Property<PropertyType>(
-                                                                                              parent,
-                                                                                              traits::Service<typename PropertyType::Interface>::interface_name(),
-                                                                                              PropertyType::name(),
-                                                                                              PropertyType::writable));
+    return std::shared_ptr<Property<PropertyType>>(
+                                                new Property<PropertyType>(
+                                                    parent,
+                                                    traits::Service<typename PropertyType::Interface>::interface_name(),
+                                                    PropertyType::name(),
+                                                    PropertyType::writable));
 }
 
-                                        template<typename PropertyType>
-                                        Property<PropertyType>::Property(
-                                            const std::shared_ptr<Object>& parent,
-                                            const std::string& interface,
-                                            const std::string& name,
-                                            bool writable)
-                                        : parent(parent),
-interface(interface),
-name(name),
-writable(writable)
+template<typename PropertyType>
+Property<PropertyType>::Property(
+    const std::shared_ptr<Object>& parent,
+    const std::string& interface,
+    const std::string& name,
+    bool writable)
+    : parent(parent),
+      interface(interface),
+      name(name),
+      writable(writable)
 {
     if (!parent->is_stub())
     {
         parent->get_property_router.install_route(
-                    Object::PropertyKey
-        {
-                        traits::Service<typename PropertyType::Interface>::interface_name(),
-                        PropertyType::name()
-                    },
-                    std::bind(&Property::handle_get, this, std::placeholders::_1));
+            Object::PropertyKey
+            {
+                traits::Service<typename PropertyType::Interface>::interface_name(),
+                PropertyType::name()
+            },
+            std::bind(&Property::handle_get, this, std::placeholders::_1));
         parent->set_property_router.install_route(
-                    Object::PropertyKey
-        {
-                        traits::Service<typename PropertyType::Interface>::interface_name(),
-                        PropertyType::name()
-                    },
-                    std::bind(
-                        &Property::handle_set,
-                        this,
-                        std::placeholders::_1));
+            Object::PropertyKey
+            {
+                traits::Service<typename PropertyType::Interface>::interface_name(),
+                PropertyType::name()
+            },
+            std::bind(
+                &Property::handle_set,
+                this,
+                std::placeholders::_1));
     }
 }
 

=== modified file 'src/core/dbus/CMakeLists.txt'
--- src/core/dbus/CMakeLists.txt	2013-11-27 18:57:42 +0000
+++ src/core/dbus/CMakeLists.txt	2014-01-13 07:51:24 +0000
@@ -23,11 +23,18 @@
   ${CMAKE_SOURCE_DIR}/include
   ${DBUS_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
-  )
+  ${PROCESS_CPP_INCLUDE_DIR}
+)
+
+configure_file(
+  fixture.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/fixture.cpp @ONLY
+)
 
 add_library(
   dbus-cpp SHARED
 
+  ${CMAKE_CURRENT_BINARY_DIR}/fixture.cpp
+
   bus.cpp
   dbus.cpp
   error.cpp
@@ -46,6 +53,7 @@
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
   ${LIBXML2_LIBRARIES}
+  ${PROCESS_CPP_LIBRARIES}
 )
 
 set_target_properties(

=== modified file 'src/core/dbus/bus.cpp'
--- src/core/dbus/bus.cpp	2013-11-27 18:57:42 +0000
+++ src/core/dbus/bus.cpp	2014-01-13 07:51:24 +0000
@@ -17,7 +17,7 @@
  */
 
 #include <core/dbus/bus.h>
-
+#include <core/dbus/dbus.h>
 #include <core/dbus/match_rule.h>
 #include <core/dbus/object.h>
 
@@ -68,6 +68,12 @@
                     core::dbus::Message::from_raw_message(
                         message)));
 }
+
+void init_libdbus_thread_support_and_install_shutdown_handler()
+{
+    static std::once_flag once;
+    std::call_once(once, []() { dbus_threads_init_default(); std::atexit(dbus_shutdown); });
+}
 }
 
 namespace core
@@ -101,6 +107,7 @@
           message_type_router([](const Message::Ptr& msg) { return msg->type(); }),
           signal_router([](const Message::Ptr& msg){ return msg->path(); })
     {
+        init_libdbus_thread_support_and_install_shutdown_handler();
     }
 
     std::shared_ptr<DBusConnection> connection;
@@ -116,12 +123,46 @@
     return Bus::MessageHandlerResult::not_yet_handled;
 }
 
+Bus::Bus(const std::string& address)
+    : d(new Private())
+{
+    Error se;
+    d->connection.reset(
+                dbus_connection_open_private(address.c_str(), std::addressof(se.raw())),
+                [](DBusConnection*){}
+    );
+
+    if (!d->connection)
+        throw std::runtime_error(se.print());
+
+    d->message_type_router.install_route(
+                Message::Type::signal,
+                std::bind(
+                    &Bus::SignalRouter::operator(),
+                    std::ref(d->signal_router),
+                    std::placeholders::_1));
+
+    dbus_connection_add_filter(
+                d->connection.get(),
+                static_handle_message,
+                this,
+                nullptr);
+
+    auto message = dbus::Message::make_method_call(
+                DBus::name(),
+                DBus::path(),
+                DBus::interface(),
+                "Hello");
+
+    auto reply = send_with_reply_and_block_for_at_most(message, std::chrono::seconds(1));
+
+    if (reply->type() == Message::Type::error)
+        throw std::runtime_error(reply->error().print());
+}
+
 Bus::Bus(WellKnownBus bus)
     : d(new Private())
 {
-    static std::once_flag once;
-    std::call_once(once, []() { dbus_threads_init_default(); std::atexit(dbus_shutdown); });
-
     Error se;
     d->connection.reset(
                 dbus_bus_get_private(static_cast<DBusBusType>(bus), std::addressof(se.raw())),

=== modified file 'src/core/dbus/dbus.cpp'
--- src/core/dbus/dbus.cpp	2013-11-27 18:57:42 +0000
+++ src/core/dbus/dbus.cpp	2014-01-13 07:51:24 +0000
@@ -18,6 +18,9 @@
 
 #include <core/dbus/dbus.h>
 
+#include <core/dbus/object.h>
+#include <core/dbus/service.h>
+
 #include <core/dbus/types/stl/string.h>
 #include <core/dbus/types/stl/vector.h>
 
@@ -44,6 +47,25 @@
     }
 };
 
+struct DBus::Hello
+{
+    typedef DBus Interface;
+
+    inline static const std::string& name()
+    {
+        static const std::string s
+        {
+            "Hello"
+        };
+        return s;
+    }
+
+    inline static const std::chrono::milliseconds default_timeout()
+    {
+        return std::chrono::seconds{1};
+    }
+};
+
 struct DBus::GetConnectionUnixProcessID
 {
     typedef DBus Interface;
@@ -121,5 +143,10 @@
 {
     return object->invoke_method_synchronously<GetConnectionUnixUser, uint32_t>(name).value();
 }
+
+std::string DBus::hello() const
+{
+    return object->invoke_method_synchronously<Hello, std::string>().value();
+}
 }
 }

=== added file 'src/core/dbus/fixture.cpp.in'
--- src/core/dbus/fixture.cpp.in	1970-01-01 00:00:00 +0000
+++ src/core/dbus/fixture.cpp.in	2014-01-13 07:51:24 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <core/dbus/fixture.h>
+
+#include <core/dbus/bus.h>
+
+#include <core/posix/exec.h>
+#include <core/posix/this_process.h>
+
+struct core::dbus::Fixture::Private
+{
+    struct Session
+    {
+        Session(const std::string& config_file)
+        {
+            std::vector<std::string> argv
+            {
+                "--config-file",
+                config_file,
+                "--print-address"
+            };
+
+            std::map<std::string, std::string> env;
+            core::posix::this_process::env::for_each([&env](const std::string& key, const std::string& value)
+            {
+                env.insert(std::make_pair(key, value));
+            });
+
+            daemon = core::posix::exec(
+                        "/bin/dbus-daemon",
+                        argv,
+                        env,
+                        core::posix::StandardStream::stdout);
+
+            daemon.cout() >> address;
+
+            if (address.empty())
+                throw std::runtime_error("Session: Could not read address of bus instance.");
+
+            core::posix::this_process::env::set_or_throw("DBUS_SESSION_BUS_ADDRESS", address);
+            core::posix::this_process::env::set_or_throw("DBUS_STARTER_ADDRESS", address);
+            core::posix::this_process::env::set_or_throw("DBUS_STARTER_BUS_TYPE", "session");
+        }
+
+        core::posix::ChildProcess daemon = core::posix::ChildProcess::invalid();
+        std::string address;
+    } session;
+
+    struct System
+    {
+        System(const std::string& config_file)
+        {
+            std::vector<std::string> argv
+            {
+                "--config-file",
+                config_file,
+                "--print-address"
+            };
+
+            std::map<std::string, std::string> env;
+            core::posix::this_process::env::for_each([&env](const std::string& key, const std::string& value)
+            {
+                env.insert(std::make_pair(key, value));
+            });
+
+            daemon = core::posix::exec(
+                        "/bin/dbus-daemon",
+                        argv,
+                        env,
+                        core::posix::StandardStream::stdout);
+
+            daemon.cout() >> address;
+
+            if (address.empty())
+                throw std::runtime_error("System: Could not read address of bus instance.");
+
+            core::posix::this_process::env::set_or_throw("DBUS_SYSTEM_BUS_ADDRESS", address);
+        }
+
+        core::posix::ChildProcess daemon = core::posix::ChildProcess::invalid();
+        std::string address;
+    } system;
+};
+
+const std::string& core::dbus::Fixture::default_session_bus_config_file()
+{
+    static const std::string s{"@CMAKE_INSTALL_DATADIR@/dbus-cpp/session.conf"};
+    return s;
+}
+
+const std::string& core::dbus::Fixture::default_system_bus_config_file()
+{
+    static const std::string s{"@CMAKE_INSTALL_DATADIR@/dbus-cpp/system.conf"};
+    return s;
+}
+
+core::dbus::Fixture::Fixture(const std::string& session_bus_configuration_file,
+                             const std::string& system_bus_configuration_file)
+    : d(new Private{Private::Session{session_bus_configuration_file},
+                    Private::System{system_bus_configuration_file}})
+{
+}
+
+core::dbus::Fixture::~Fixture()
+{
+}
+
+std::shared_ptr<core::dbus::Bus> core::dbus::Fixture::create_connection_to_session_bus()
+{
+    return std::shared_ptr<core::dbus::Bus>(new core::dbus::Bus{d->session.address});
+}
+
+std::shared_ptr<core::dbus::Bus> core::dbus::Fixture::create_connection_to_system_bus()
+{
+    return std::shared_ptr<core::dbus::Bus>(new core::dbus::Bus{d->system.address});
+}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-10-27 18:15:45 +0000
+++ tests/CMakeLists.txt	2014-01-13 07:51:24 +0000
@@ -21,36 +21,24 @@
 include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
 set (CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
 
-# We actually deliberately ignore the result of read and write in our tests
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-result")
-
-find_package(PkgConfig)
 find_package(Threads)
 
-pkg_check_modules(DBUS dbus-1)
+add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/test_data.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/test_data.h @ONLY)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-option(
-  DBUS_CPP_ENABLE_DBUS_TEST_RUNNER
-  "Rely on dbus test runner to start a private session for testing purposes"
-  ON
-  )
-
-if (DBUS_CPP_ENABLE_DBUS_TEST_RUNNER)
-  find_program(DBUS_TEST_RUNNER_EXECUTABLE dbus-test-runner)
-  message(STATUS "Executing test suite under dbus-test-runner")
-endif (DBUS_CPP_ENABLE_DBUS_TEST_RUNNER)
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 include_directories(
   ${DBUS_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${GTEST_INCLUDE_DIRS}
-  )
+  ${PROCESS_CPP_INCLUDE_DIRS}
+)
 
 add_executable(
   bus_test
@@ -112,7 +100,8 @@
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
-  )
+  ${PROCESS_CPP_LIBRARIES}
+)
 
 target_link_libraries(
   dbus_test
@@ -224,26 +213,13 @@
   ${GTEST_BOTH_LIBRARIES}
   )
 
-if (DBUS_CPP_ENABLE_DBUS_TEST_RUNNER)
-  add_test(bus_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/bus_test)
-  add_test(dbus_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/dbus_test)
-  add_test(executor_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/executor_test)
-  add_test(codec_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/codec_test)
-  add_test(compiler_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/compiler_test)
-  add_test(stl_codec_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/stl_codec_test)
-  add_test(message_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/message_test)
-  add_test(match_rule_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/match_rule_test)
-  add_test(message_router_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/message_router_test)
-  add_test(service_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/service_test)
-else(DBUS_CPP_ENABLE_DBUS_TEST_RUNNER)
-  add_test(bus_test ${CMAKE_CURRENT_BINARY_DIR}/bus_test)
-  add_test(dbus_test ${CMAKE_CURRENT_BINARY_DIR}/dbus_test)
-  add_test(executor_test ${CMAKE_CURRENT_BINARY_DIR}/executor_test)
-  add_test(codec_test ${CMAKE_CURRENT_BINARY_DIR}/codec_test)
-  add_test(compiler_test ${CMAKE_CURRENT_BINARY_DIR}/compiler_test)
-  add_test(stl_codec_test ${CMAKE_CURRENT_BINARY_DIR}/stl_codec_test)
-  add_test(message_test ${CMAKE_CURRENT_BINARY_DIR}/message_test)
-  add_test(match_rule_test ${CMAKE_CURRENT_BINARY_DIR}/match_rule_test)
-  add_test(message_router_test ${CMAKE_CURRENT_BINARY_DIR}/message_router_test)
-  add_test(service_test ${CMAKE_CURRENT_BINARY_DIR}/service_test)
-endif(DBUS_CPP_ENABLE_DBUS_TEST_RUNNER)
+add_test(bus_test ${CMAKE_CURRENT_BINARY_DIR}/bus_test)
+add_test(dbus_test ${CMAKE_CURRENT_BINARY_DIR}/dbus_test)
+add_test(executor_test ${CMAKE_CURRENT_BINARY_DIR}/executor_test)
+add_test(codec_test ${CMAKE_CURRENT_BINARY_DIR}/codec_test)
+add_test(compiler_test ${CMAKE_CURRENT_BINARY_DIR}/compiler_test)
+add_test(stl_codec_test ${CMAKE_CURRENT_BINARY_DIR}/stl_codec_test)
+add_test(message_test ${CMAKE_CURRENT_BINARY_DIR}/message_test)
+add_test(match_rule_test ${CMAKE_CURRENT_BINARY_DIR}/match_rule_test)
+add_test(message_router_test ${CMAKE_CURRENT_BINARY_DIR}/message_router_test)
+add_test(service_test ${CMAKE_CURRENT_BINARY_DIR}/service_test)

=== modified file 'tests/bus_test.cpp'
--- tests/bus_test.cpp	2013-11-27 18:57:42 +0000
+++ tests/bus_test.cpp	2014-01-13 07:51:24 +0000
@@ -17,11 +17,21 @@
  */
 
 #include <core/dbus/bus.h>
+#include <core/dbus/codec.h>
 #include <core/dbus/dbus.h>
+#include <core/dbus/fixture.h>
 #include <core/dbus/match_rule.h>
+#include <core/dbus/message_streaming_operators.h>
+
+#include <core/dbus/types/stl/string.h>
+#include <core/dbus/types/stl/vector.h>
 
 #include <core/dbus/asio/executor.h>
 
+#include "test_data.h"
+
+#include <core/posix/exec.h>
+
 #include <boost/asio.hpp>
 
 #include <gtest/gtest.h>
@@ -33,22 +43,21 @@
 
 namespace
 {
-core::dbus::Bus::Ptr the_session_bus()
-{
-    core::dbus::Bus::Ptr session_bus = std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::session);
-    return session_bus;
-}
-}
-
-TEST(Bus, ConstructionForSessionBusDoesNotThrow)
-{
-    std::shared_ptr<core::dbus::Bus> bus;
-    EXPECT_NO_THROW(bus.reset(new core::dbus::Bus(core::dbus::WellKnownBus::session)););
-
-    EXPECT_TRUE(bus->raw() != nullptr);
-}
-
-TEST(Bus, BlockingMethodInvocationSucceedsForValidMessage)
+struct Bus : public core::dbus::testing::Fixture
+{
+};
+
+auto session_bus_config_file =
+        core::dbus::testing::Fixture::default_session_bus_config_file() =
+        core::testing::session_bus_configuration_file();
+
+auto system_bus_config_file =
+        core::dbus::testing::Fixture::default_system_bus_config_file() =
+        core::testing::system_bus_configuration_file();
+
+}
+
+TEST_F(Bus, BlockingMethodInvocationSucceedsForValidMessage)
 {
     static const char* expected_signature = DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING;
     auto msg = core::dbus::Message::make_method_call(
@@ -57,7 +66,7 @@
                 dbus::DBus::name(),
                 "ListNames");
 
-    auto bus = the_session_bus();
+    auto bus = session_bus();
     const std::chrono::milliseconds timeout = std::chrono::seconds(10);
     std::shared_ptr<core::dbus::Message> reply = nullptr;
     EXPECT_NO_THROW(
@@ -70,7 +79,7 @@
     EXPECT_EQ(expected_signature, reply->signature());
 }
 
-TEST(Bus, NonBlockingMethodInvocationSucceedsForValidMessage)
+TEST_F(Bus, NonBlockingMethodInvocationSucceedsForValidMessage)
 {
     auto msg = core::dbus::Message::make_method_call(
                 dbus::DBus::name(),
@@ -78,7 +87,7 @@
                 dbus::DBus::name(),
                 "ListNames");
 
-    auto bus = the_session_bus();
+    auto bus = session_bus();
     const std::chrono::milliseconds timeout = std::chrono::seconds(10);
 
     auto call = bus->send_with_reply_and_timeout(msg, timeout);
@@ -88,23 +97,22 @@
     EXPECT_TRUE(result.size() > 0);
 }
 
-TEST(Bus, HasOwnerForNameReturnsTrueForExistingName)
+TEST_F(Bus, HasOwnerForNameReturnsTrueForExistingName)
 {
-    core::dbus::Bus bus(core::dbus::WellKnownBus::session);
-
-    EXPECT_TRUE(bus.has_owner_for_name(dbus::DBus::name()));
+    auto bus = session_bus();
+    EXPECT_TRUE(bus->has_owner_for_name(dbus::DBus::name()));
 }
 
-TEST(Bus, HasOwnerForNameReturnsFalseForNonExistingName)
+TEST_F(Bus, HasOwnerForNameReturnsFalseForNonExistingName)
 {
-    auto bus = the_session_bus();
+    auto bus = session_bus();
     static const std::string non_existing_name = "com.canonical.does.not.exist";
     EXPECT_FALSE(bus->has_owner_for_name(non_existing_name));
 }
 
-TEST(Bus, AddingAndRemovingAValidMatchRuleDoesNotThrow)
+TEST_F(Bus, AddingAndRemovingAValidMatchRuleDoesNotThrow)
 {
-    auto bus = the_session_bus();
+    auto bus = session_bus();
 
     static const dbus::MatchRule valid_match_rule = dbus::MatchRule().type(dbus::Message::Type::signal);
 
@@ -137,12 +145,13 @@
                 name);
 }
 }
-TEST(Bus, InstallingARouteForSignalsResultsInTheRouteBeingInvoked)
+
+TEST_F(Bus, InstallingARouteForSignalsResultsInTheRouteBeingInvoked)
 {
     const std::string path{"/org/gnome/SettingsDaemon/Power"};
     const core::dbus::types::ObjectPath to_route_for(path);
     bool invoked {false};
-    auto bus = the_session_bus();
+    auto bus = session_bus();
     bus->install_executor(core::dbus::asio::make_executor(bus));
     bus->access_signal_router().install_route(to_route_for,[&](const dbus::Message::Ptr&)
                                               {
@@ -155,4 +164,3 @@
                 "LaLeLu");
     bus->access_signal_router()(signal);
 }
-

=== modified file 'tests/compiler_test.cpp'
--- tests/compiler_test.cpp	2013-11-27 18:57:42 +0000
+++ tests/compiler_test.cpp	2014-01-13 07:51:24 +0000
@@ -262,35 +262,35 @@
     const char* argv[] =
     {
         "dbus-cppc",
-        testing::com::canonical::user_metrics_introspection_file()
+        core::testing::com::canonical::user_metrics_introspection_file()
     };
 
     EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
 
-    argv[1] = testing::com::canonical::url_dispatcher_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::cdma_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::firmware_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::gsm::card_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::gsm::contact_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::gsm::hso_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::gsm::network_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::gsm::sms_introspection_file();
-    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
-
-    argv[1] = testing::org::freedesktop::modem_manager::modem::gsm::ussd_introspection_file();
+    argv[1] = core::testing::com::canonical::url_dispatcher_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::cdma_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::firmware_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::gsm::card_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::gsm::contact_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::gsm::hso_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::gsm::network_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::gsm::sms_introspection_file();
+    EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
+
+    argv[1] = core::testing::org::freedesktop::modem_manager::modem::gsm::ussd_introspection_file();
     EXPECT_EQ(EXIT_SUCCESS, dbus::Compiler::main(2, argv));
 }

=== modified file 'tests/dbus_test.cpp'
--- tests/dbus_test.cpp	2013-11-27 18:57:42 +0000
+++ tests/dbus_test.cpp	2014-01-13 07:51:24 +0000
@@ -17,12 +17,16 @@
  */
 
 #include <core/dbus/dbus.h>
-
+#include <core/dbus/fixture.h>
+#include <core/dbus/object.h>
+#include <core/dbus/service.h>
 #include <core/dbus/asio/executor.h>
 
+#include "test_data.h"
 #include "test_service.h"
-#include "cross_process_sync.h"
-#include "fork_and_run.h"
+
+#include <core/testing/cross_process_sync.h>
+#include <core/testing/fork_and_run.h>
 
 #include <gtest/gtest.h>
 
@@ -30,25 +34,31 @@
 
 namespace
 {
-dbus::Bus::Ptr the_session_bus()
+struct DBus : public core::dbus::testing::Fixture
 {
-    dbus::Bus::Ptr session_bus = std::make_shared<dbus::Bus>(dbus::WellKnownBus::session);
-    return session_bus;
-}
-}
-
-TEST(DBus, QueryingUnixProcessIdReturnsCorrectResult)
+};
+
+auto session_bus_config_file =
+        core::dbus::testing::Fixture::default_session_bus_config_file() =
+        core::testing::session_bus_configuration_file();
+
+auto system_bus_config_file =
+        core::dbus::testing::Fixture::default_system_bus_config_file() =
+        core::testing::system_bus_configuration_file();
+}
+
+TEST_F(DBus, QueryingUnixProcessIdReturnsCorrectResult)
 {
     const std::string path{"/this/is/just/a/test/service"};
 
     uint32_t pid = getpid();
     uint32_t uid = getuid();
 
-    test::CrossProcessSync barrier;
+    core::testing::CrossProcessSync barrier;
 
-    auto child = [path, pid, uid, &barrier]()
+    auto service = [this, path, pid, uid, &barrier]()
     {
-        auto bus = the_session_bus();
+        auto bus = session_bus();
         bus->install_executor(core::dbus::asio::make_executor(bus));
         dbus::DBus daemon{bus};
 
@@ -69,24 +79,28 @@
         };
 
         object->install_method_handler<test::Service::Method>(handler);
-        barrier.signal_ready();
+        barrier.try_signal_ready_for(std::chrono::milliseconds{500});
         bus->run();
 
         EXPECT_EQ(pid, sender_pid);
         EXPECT_EQ(uid, sender_uid);
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
     };
 
-    auto parent = [path, &barrier]()
+    auto client = [this, path, &barrier]()
     {
-        auto bus = the_session_bus();
+        auto bus = session_bus();
         
         auto service = dbus::Service::use_service<test::Service>(bus);
         auto object = service->object_for_path(dbus::types::ObjectPath{path});
 
-        barrier.wait_for_signal_ready();
-
-        object->invoke_method_synchronously<test::Service::Method, void>();        
+        barrier.wait_for_signal_ready_for(std::chrono::milliseconds{500});
+
+        object->invoke_method_synchronously<test::Service::Method, void>();
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
     };
 
-    ASSERT_NO_FATAL_FAILURE(test::fork_and_run(child, parent));
+    ASSERT_NO_FATAL_FAILURE(core::testing::fork_and_run(service, client));
 }

=== modified file 'tests/executor_test.cpp'
--- tests/executor_test.cpp	2013-11-27 18:57:42 +0000
+++ tests/executor_test.cpp	2014-01-13 07:51:24 +0000
@@ -19,44 +19,54 @@
 #include <core/dbus/asio/executor.h>
 
 #include <core/dbus/dbus.h>
+#include <core/dbus/fixture.h>
+#include <core/dbus/object.h>
 #include <core/dbus/service.h>
 
-#include "cross_process_sync.h"
-#include "fork_and_run.h"
+#include "test_data.h"
 #include "test_service.h"
 
+#include <core/testing/cross_process_sync.h>
+#include <core/testing/fork_and_run.h>
+
 #include <gtest/gtest.h>
 
 namespace dbus = core::dbus;
 
 namespace
 {
-dbus::Bus::Ptr the_session_bus()
+struct Executor : public core::dbus::testing::Fixture
 {
-    dbus::Bus::Ptr session_bus = std::make_shared<dbus::Bus>(dbus::WellKnownBus::session);
-    return session_bus;
-}
-}
-
-TEST(Executor, ThrowsOnConstructionFromNullBus)
+};
+
+auto session_bus_config_file =
+        core::dbus::testing::Fixture::default_session_bus_config_file() =
+        core::testing::session_bus_configuration_file();
+
+auto system_bus_config_file =
+        core::dbus::testing::Fixture::default_system_bus_config_file() =
+        core::testing::system_bus_configuration_file();
+}
+
+TEST_F(Executor, ThrowsOnConstructionFromNullBus)
 {
     EXPECT_ANY_THROW(core::dbus::asio::make_executor(core::dbus::Bus::Ptr{}));
 }
 
-TEST(Executor, DoesNotThrowForExistingBus)
+TEST_F(Executor, DoesNotThrowForExistingBus)
 {
-    core::dbus::Bus::Ptr bus{new core::dbus::Bus{core::dbus::WellKnownBus::session}};
+    auto bus = session_bus();
     EXPECT_NO_THROW(bus->install_executor(core::dbus::asio::make_executor(bus)));
 }
 
-TEST(Executor, ABusRunByAnExecutorReceivesSignals)
+TEST_F(Executor, ABusRunByAnExecutorReceivesSignals)
 {
-    test::CrossProcessSync cross_process_sync;
+    core::testing::CrossProcessSync cross_process_sync;
     
     const int64_t expected_value = 42;
-    auto child = [expected_value, &cross_process_sync]()
+    auto service = [this, expected_value, &cross_process_sync]()
     {
-        auto bus = the_session_bus();        
+        auto bus = session_bus();
         bus->install_executor(dbus::asio::make_executor(bus));
         auto service = dbus::Service::add_service<test::Service>(bus);
         auto skeleton = service->add_object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
@@ -68,16 +78,19 @@
             bus->send(reply);
             skeleton->emit_signal<test::Service::Signals::Dummy, int64_t>(expected_value);
         });
-        cross_process_sync.signal_ready();
+        cross_process_sync.try_signal_ready_for(std::chrono::milliseconds{500});
         bus->run();
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
     };
-    auto parent = [expected_value, cross_process_sync]()
+
+    auto client = [this, expected_value, &cross_process_sync]() -> core::posix::exit::Status
     {
-        auto bus = the_session_bus();
+        auto bus = session_bus();
         bus->install_executor(dbus::asio::make_executor(bus));
         std::thread t{[bus](){bus->run();}};
         
-        cross_process_sync.wait_for_signal_ready();
+        EXPECT_EQ(1, cross_process_sync.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
 
         auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
         auto stub = stub_service->object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
@@ -93,12 +106,14 @@
         if (t.joinable())
             t.join();
 
-        ASSERT_FALSE(result.is_error());
-        ASSERT_EQ(expected_value, result.value());
+        EXPECT_FALSE(result.is_error());
+        EXPECT_EQ(expected_value, result.value());
         EXPECT_EQ(expected_value, received_signal_value);
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
     };
 
-    EXPECT_NO_FATAL_FAILURE(test::fork_and_run(child, parent));
+    EXPECT_NO_FATAL_FAILURE(core::testing::fork_and_run(service, client));
 }
 
 /*TEST(Bus, TimeoutThrowsForNullDBusWatch)

=== modified file 'tests/message_test.cpp'
--- tests/message_test.cpp	2013-11-27 18:57:42 +0000
+++ tests/message_test.cpp	2014-01-13 07:51:24 +0000
@@ -16,6 +16,7 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
+#include <core/dbus/dbus.h>
 #include <core/dbus/message.h>
 
 #include <gtest/gtest.h>
@@ -27,9 +28,9 @@
 
 TEST(Message, BuildingAMethodCallMessageSucceedsForValidArguments)
 {
-    const std::string destination = DBUS_SERVICE_DBUS;
-    const std::string path = DBUS_PATH_DBUS;
-    const std::string interface = DBUS_SERVICE_DBUS;
+    const std::string destination = core::dbus::DBus::name();
+    const std::string path = core::dbus::DBus::path().as_string();
+    const std::string interface = core::dbus::DBus::name();
     const std::string member = "ListNames";
 
     std::shared_ptr<core::dbus::Message> msg;
@@ -39,9 +40,9 @@
 
 TEST(Message, BuildingAMethodCallMessageThrowsForInvalidArguments)
 {
-    const std::string destination = DBUS_SERVICE_DBUS;
+    const std::string destination = core::dbus::DBus::name();
     const std::string path = "an:invalid:path";
-    const std::string interface = DBUS_SERVICE_DBUS;
+    const std::string interface = core::dbus::DBus::name();
     const std::string member = "ListNames";
 
     std::shared_ptr<core::dbus::Message> msg;
@@ -51,9 +52,9 @@
 
 TEST(Message, AccessingAReaderOnAnEmptyMessageThrows)
 {
-    const std::string destination = DBUS_SERVICE_DBUS;
-    const std::string path = DBUS_PATH_DBUS;
-    const std::string interface = DBUS_SERVICE_DBUS;
+    const std::string destination = core::dbus::DBus::name();
+    const std::string path = core::dbus::DBus::path().as_string();
+    const std::string interface = core::dbus::DBus::name();
     const std::string member = "ListNames";
 
     auto msg = core::dbus::Message::make_method_call(destination, path, interface, member);
@@ -63,9 +64,9 @@
 
 TEST(Message, AccessingAWriterOnAnyMessageSucceeds)
 {
-    const std::string destination = DBUS_SERVICE_DBUS;
-    const std::string path = DBUS_PATH_DBUS;
-    const std::string interface = DBUS_SERVICE_DBUS;
+    const std::string destination = core::dbus::DBus::name();
+    const std::string path = core::dbus::DBus::path().as_string();
+    const std::string interface = core::dbus::DBus::name();
     const std::string member = "ListNames";
 
     auto msg = core::dbus::Message::make_method_call(
@@ -86,9 +87,9 @@
 
 TEST(Message, WriteAndSuccessiveReadAreIdempotent)
 {
-    const std::string destination = DBUS_SERVICE_DBUS;
-    const std::string path = DBUS_PATH_DBUS;
-    const std::string interface = DBUS_SERVICE_DBUS;
+    const std::string destination = core::dbus::DBus::name();
+    const std::string path = core::dbus::DBus::path().as_string();
+    const std::string interface = core::dbus::DBus::name();
     const std::string member = "ListNames";
 
     auto msg = core::dbus::Message::make_method_call(
@@ -122,9 +123,9 @@
 
 TEST(Message, WriteAndSuccessiveIterationAreIdempotent)
 {
-    const std::string destination = DBUS_SERVICE_DBUS;
-    const std::string path = DBUS_PATH_DBUS;
-    const std::string interface = DBUS_SERVICE_DBUS;
+    const std::string destination = core::dbus::DBus::name();
+    const std::string path = core::dbus::DBus::path().as_string();
+    const std::string interface = core::dbus::DBus::name();
     const std::string member = "ListNames";
 
     auto msg = core::dbus::Message::make_method_call(

=== modified file 'tests/service_test.cpp'
--- tests/service_test.cpp	2013-12-25 10:16:19 +0000
+++ tests/service_test.cpp	2014-01-13 07:51:24 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <core/dbus/dbus.h>
+#include <core/dbus/fixture.h>
 #include <core/dbus/object.h>
 #include <core/dbus/property.h>
 #include <core/dbus/service.h>
@@ -26,10 +27,12 @@
 
 #include <core/dbus/asio/executor.h>
 
-#include "cross_process_sync.h"
-#include "fork_and_run.h"
+#include "test_data.h"
 #include "test_service.h"
 
+#include <core/testing/cross_process_sync.h>
+#include <core/testing/fork_and_run.h>
+
 #include <gtest/gtest.h>
 
 #include <thread>
@@ -38,108 +41,115 @@
 
 namespace
 {
-dbus::Bus::Ptr the_session_bus()
-{
-    dbus::Bus::Ptr session_bus = std::make_shared<dbus::Bus>(dbus::WellKnownBus::session);
-    return session_bus;
-}
-}
-
-TEST(Service, AccessingAnExistingServiceAndItsObjectsOnTheBusWorks)
-{
-    auto bus = the_session_bus();
+struct Service : public core::dbus::testing::Fixture
+{
+};
+
+auto session_bus_config_file =
+        core::dbus::testing::Fixture::default_session_bus_config_file() =
+        core::testing::session_bus_configuration_file();
+
+auto system_bus_config_file =
+        core::dbus::testing::Fixture::default_system_bus_config_file() =
+        core::testing::system_bus_configuration_file();
+}
+
+TEST_F(Service, AccessingAnExistingServiceAndItsObjectsOnTheBusWorks)
+{
+    auto bus = session_bus();
     auto names = dbus::DBus(bus).list_names();
 
     ASSERT_GT(names.size(), std::size_t{0});
 }
 
-TEST(Service, AddingServiceAndObjectAndCallingIntoItSucceeds)
+TEST_F(Service, AddingServiceAndObjectAndCallingIntoItSucceeds)
 {
-    test::CrossProcessSync cps1;
-
-    const int64_t expected_value = 42;
-
-    auto child = [expected_value, &cps1]()
-    {
-        auto bus = the_session_bus();
-        bus->install_executor(core::dbus::asio::make_executor(bus));
-        auto service = dbus::Service::add_service<test::Service>(bus);
-        auto skeleton = service->add_object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
-        auto signal = skeleton->get_signal<test::Service::Signals::Dummy>();
-        auto writable_property = skeleton->get_property<test::Service::Properties::Dummy>();
-        writable_property->set(expected_value);
-
-        skeleton->install_method_handler<test::Service::Method>([bus, skeleton, expected_value](const dbus::Message::Ptr& msg)
-        {
-            std::cout << __PRETTY_FUNCTION__ << std::endl;
-            auto reply = dbus::Message::make_method_return(msg);
-            reply->writer() << expected_value;
-            bus->send(reply);
-            skeleton->emit_signal<test::Service::Signals::Dummy, int64_t>(expected_value);
-        });
-
-        std::thread t{[bus](){ bus->run(); }};
-        cps1.signal_ready();
-        if (t.joinable())
-            t.join();
-    };
-
-    auto parent = [expected_value, cps1]()
-    {
-        auto bus = the_session_bus();
-        bus->install_executor(core::dbus::asio::make_executor(bus));
-        std::thread t{[bus](){ bus->run(); }};
-        cps1.wait_for_signal_ready();
-
-        auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
-        auto stub = stub_service->object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
-        auto writable_property = stub->get_property<test::Service::Properties::Dummy>();
-        writable_property->changed().connect([](double d)
-        {
-            std::cout << "Dummy property changed: " << d << std::endl;
-        });
-        auto signal = stub->get_signal<test::Service::Signals::Dummy>();
-        int64_t received_signal_value = -1;
-        signal->connect([bus, &received_signal_value](const int32_t& value)
-        {
-            received_signal_value = value;
-            bus->stop();
-        });
-        auto result = stub->invoke_method_synchronously<test::Service::Method, int64_t>();
-        ASSERT_FALSE(result.is_error());
-        ASSERT_EQ(expected_value, result.value());
-        ASSERT_EQ(expected_value, writable_property->get());
-        ASSERT_NO_THROW(writable_property->set(4242));
-        ASSERT_EQ(4242, writable_property->get());
-
-        if (t.joinable())
-            t.join();
-
-        EXPECT_EQ(expected_value, received_signal_value);
-    };
-
-    EXPECT_NO_FATAL_FAILURE(test::fork_and_run(child, parent));
+        core::testing::CrossProcessSync cps1;
+
+        const int64_t expected_value = 42;
+
+        auto service = [this, expected_value, &cps1]()
+        {
+            auto bus = session_bus();
+            bus->install_executor(core::dbus::asio::make_executor(bus));
+            auto service = dbus::Service::add_service<test::Service>(bus);
+            auto skeleton = service->add_object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
+            auto signal = skeleton->get_signal<test::Service::Signals::Dummy>();
+            auto writable_property = skeleton->get_property<test::Service::Properties::Dummy>();
+            writable_property->set(expected_value);
+
+            skeleton->install_method_handler<test::Service::Method>([bus, skeleton, expected_value](const dbus::Message::Ptr& msg)
+            {
+                auto reply = dbus::Message::make_method_return(msg);
+                reply->writer() << expected_value;
+                bus->send(reply);
+                skeleton->emit_signal<test::Service::Signals::Dummy, int64_t>(expected_value);
+            });
+
+            std::thread t{[bus](){ bus->run(); }};
+            cps1.try_signal_ready_for(std::chrono::milliseconds{500});
+            if (t.joinable())
+                t.join();
+
+            return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
+        };
+
+        auto client = [this, expected_value, &cps1]()
+        {
+            auto bus = session_bus();
+            bus->install_executor(core::dbus::asio::make_executor(bus));
+            std::thread t{[bus](){ bus->run(); }};
+            EXPECT_EQ(1, cps1.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
+
+            auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
+            auto stub = stub_service->object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
+            auto writable_property = stub->get_property<test::Service::Properties::Dummy>();
+            writable_property->changed().connect([](double d)
+            {
+                std::cout << "Dummy property changed: " << d << std::endl;
+            });
+            auto signal = stub->get_signal<test::Service::Signals::Dummy>();
+            int64_t received_signal_value = -1;
+            signal->connect([bus, &received_signal_value](const int32_t& value)
+            {
+                received_signal_value = value;
+                bus->stop();
+            });
+            auto result = stub->invoke_method_synchronously<test::Service::Method, int64_t>();
+            EXPECT_FALSE(result.is_error());
+            EXPECT_EQ(expected_value, result.value());
+            EXPECT_EQ(expected_value, writable_property->get());
+            EXPECT_NO_THROW(writable_property->set(4242));
+            EXPECT_EQ(4242, writable_property->get());
+
+            if (t.joinable())
+                t.join();
+
+            EXPECT_EQ(expected_value, received_signal_value);
+
+            return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
+        };
+
+        EXPECT_NO_FATAL_FAILURE(core::testing::fork_and_run(service, client));
 }
 
-TEST(Service, AddingANonExistingServiceDoesNotThrow)
+TEST_F(Service, AddingANonExistingServiceDoesNotThrow)
 {
-    auto bus = the_session_bus();
     const std::string service_name
     {
         "very.unlikely.that.this.name.exists"
     };
-    ASSERT_NO_THROW(auto service = dbus::Service::add_service<test::Service>(bus););
+    ASSERT_NO_THROW(auto service = dbus::Service::add_service<test::Service>(session_bus()););
 }
 
-TEST(Service, AddingAnExistingServiceThrowsForSpecificFlags)
+TEST_F(Service, AddingAnExistingServiceThrowsForSpecificFlags)
 {
-    auto bus = the_session_bus();
     const std::string service_name
     {
         "org.freedesktop.DBus"
     };
     dbus::Bus::RequestNameFlag flags{dbus::Bus::RequestNameFlag::not_set};
-    ASSERT_ANY_THROW(auto service = dbus::Service::add_service<dbus::DBus>(bus, flags););
+    ASSERT_ANY_THROW(auto service = dbus::Service::add_service<dbus::DBus>(session_bus(), flags););
 }
 
 TEST(VoidResult, DefaultConstructionYieldsANonErrorResult)

=== modified file 'tests/stl_codec_test.cpp'
--- tests/stl_codec_test.cpp	2014-01-05 18:58:19 +0000
+++ tests/stl_codec_test.cpp	2014-01-13 07:51:24 +0000
@@ -17,7 +17,10 @@
  */
 
 #include <core/dbus/dbus.h>
+#include <core/dbus/message_streaming_operators.h>
+
 #include <core/dbus/types/stl/map.h>
+#include <core/dbus/types/stl/string.h>
 #include <core/dbus/types/stl/tuple.h>
 
 #include <gtest/gtest.h>

=== modified file 'tests/test_data.h.in'
--- tests/test_data.h.in	2013-10-27 18:18:38 +0000
+++ tests/test_data.h.in	2014-01-13 07:51:24 +0000
@@ -19,8 +19,21 @@
 #ifndef TEST_DATA_H_
 #define TEST_DATA_H_
 
+namespace core
+{
 namespace testing
 {
+
+const char* session_bus_configuration_file()
+{
+    return "@CMAKE_SOURCE_DIR@/data/session.conf";
+}
+
+const char* system_bus_configuration_file()
+{
+    return "@CMAKE_SOURCE_DIR@/data/system.conf";
+}
+
 namespace com
 {
 namespace canonical
@@ -92,5 +105,5 @@
 }
 }
 }
-
+}
 #endif // TEST_DATA_H_