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

[Thomas Voß]

Allow for adding services without the need to describe the service with a type.
Allow for consumers of the library to specify a policy for announcing property changes, defaults to a policy that does not allow changes to maintain stable behavior.

Allow for adding services without the need to describe the service with a type.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:60
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/186/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/26/console

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

review: Needs Fixing (continuous-integration)

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

61. By Thomas Voß on 2014-07-02

Ensure that caching logic for service instances is correct.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

62. By Thomas Voß on 2014-07-04

Add property change announcement policies.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/188/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/28/console

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

review: Needs Fixing (continuous-integration)

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

63. By Thomas Voß on 2014-07-04

Adjust symbols to account for new functions.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

Please add a couple of assertions around the behaviour of announcing policy. Other than that, looks good. :)

review: Needs Fixing

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

64. By Thomas Voß on 2014-07-15

Revert inlined changes.
Add check for Property::Changed signal being emitted.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/30/console

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

review: Needs Fixing (continuous-integration)

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

65. By Thomas Voß on 2014-07-15

[ Ubuntu daily release ]
* New rebuild forced
[ Antti Kaijanmäki ]
* Fix read-only property PropertiesChanged updates. (LP: #1339589)

[Thomas Voß (thomas-voss)]

> Please add a couple of assertions around the behaviour of announcing policy.
> Other than that, looks good. :)

Added a simple test for a signal being invoked in TEST_F(Service, AddingServiceAndObjectAndCallingIntoItSucceeds).

[Pete Woods (pete-woods)]

> > Please add a couple of assertions around the behaviour of announcing policy.
> > Other than that, looks good. :)
>
> Added a simple test for a signal being invoked in TEST_F(Service,
> AddingServiceAndObjectAndCallingIntoItSucceeds).

Awesome stuff.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

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

66. By Thomas Voß on 2014-07-15

Revert changes for adding property changed signal emission policies.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/33

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

review: Approve (continuous-integration)

Unmerged revisions

66. By Thomas Voß on 2014-07-15

Revert changes for adding property changed signal emission policies.

65. By Thomas Voß on 2014-07-15

[ Ubuntu daily release ]
* New rebuild forced
[ Antti Kaijanmäki ]
* Fix read-only property PropertiesChanged updates. (LP: #1339589)

64. By Thomas Voß on 2014-07-15

Revert inlined changes.
Add check for Property::Changed signal being emitted.

63. By Thomas Voß on 2014-07-04

Adjust symbols to account for new functions.

62. By Thomas Voß on 2014-07-04

Add property change announcement policies.

61. By Thomas Voß on 2014-07-02

Ensure that caching logic for service instances is correct.

60. By Thomas Voß on 2014-07-02

Allow for adding services without the need to describe the service with a type.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-09 10:15:33 +0000
+++ debian/changelog	2014-07-15 22:21:04 +0000
@@ -1,13 +1,3 @@
-dbus-cpp (3.0.0+14.10.20140709.2-0ubuntu1) utopic; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Antti Kaijanmäki ]
-  * Fix read-only property PropertiesChanged updates. (LP: #1339589)
-
- -- Ubuntu daily release <[e-mail]>  Wed, 09 Jul 2014 10:15:33 +0000
-
 dbus-cpp (3.0.0+14.10.20140612-0ubuntu1) utopic; urgency=low
 
   [ Manuel de la Peña ]

=== modified file 'include/core/dbus/impl/property.h'
--- include/core/dbus/impl/property.h	2014-06-10 08:44:17 +0000
+++ include/core/dbus/impl/property.h	2014-07-15 22:21:04 +0000
@@ -161,14 +161,10 @@
     try
     {
         auto value = arg.as<typename PropertyType::ValueType>();
-        Super::set(value);
-    }
-    catch (const std::exception &e){
-        std::cout << __PRETTY_FUNCTION__ << ": " << e.what() << std::endl;
+        set(value);
     }
     catch (...)
     {
-        std::cout << __PRETTY_FUNCTION__ << ": " << "Unknown exception." << std::endl;
     }
 }
 }

=== modified file 'include/core/dbus/service.h'
--- include/core/dbus/service.h	2013-11-27 18:57:42 +0000
+++ include/core/dbus/service.h	2014-07-15 22:21:04 +0000
@@ -60,28 +60,53 @@
     typedef std::shared_ptr<Service> Ptr;    
 
     /**
-     * @brief Exposes a service on the bus.
+     * @brief Exposes a service on the bus, trying to acquire the given name.
      * @returns An instance of Service or nullptr in case of errors.
      * @tparam Interface Needs to a model of concept Service.
      * @param [in] connection Bus to expose the service upon.
+     * @param [in] name The name to acquire for this service.
      * @param [in] flags Flags specifying behavior when requesting a name on the bus.
      */
-    template<typename Interface>
     inline static Ptr add_service(
         const Bus::Ptr& connection,
+        const std::string& name,
         const Bus::RequestNameFlag& flags =
             Bus::RequestNameFlag::do_not_queue |
             Bus::RequestNameFlag::replace_existing)
     {
-        static Ptr instance(
+        Ptr instance(
             new Service(
-                connection, 
-                traits::Service<Interface>::interface_name(), 
+                connection,
+                name,
                 flags));
         return instance;
     }
 
     /**
+     * @brief Exposes a service on the bus.
+     * @returns An instance of Service or nullptr in case of errors.
+     * @tparam Interface Needs to a model of concept Service.
+     * @param [in] connection Bus to expose the service upon.
+     * @param [in] flags Flags specifying behavior when requesting a name on the bus.
+     */
+    template<typename Interface>
+    inline static Ptr add_service(
+        const Bus::Ptr& connection,
+        const Bus::RequestNameFlag& flags =
+            Bus::RequestNameFlag::do_not_queue |
+            Bus::RequestNameFlag::replace_existing)
+    {
+        static Ptr instance
+        {
+            add_service(connection,
+                        traits::Service<Interface>::interface_name(),
+                        flags)
+        };
+
+        return instance;
+    }
+
+    /**
      * @brief Provides access to a service on the bus via a proxy object.
      * @returns An instance of Service or nullptr in case of errors.
      * @tparam Interface Needs to be a model of concept Service.

=== modified file 'tests/service_test.cpp'
--- tests/service_test.cpp	2014-06-10 08:44:17 +0000
+++ tests/service_test.cpp	2014-07-15 22:21:04 +0000
@@ -82,25 +82,11 @@
             auto writable_property = skeleton->get_property<test::Service::Properties::Dummy>();
             writable_property->set(expected_value);
 
-            auto readonly_property = skeleton->get_property<test::Service::Properties::ReadOnly>();
-            readonly_property->set(7);
-
-            skeleton->install_method_handler<test::Service::Method>([bus, skeleton, &readonly_property, expected_value](const dbus::Message::Ptr& msg)
+            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);
-
-                readonly_property->set(expected_value);
-                auto changed_signal = skeleton->get_signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged>();
-                core::dbus::interfaces::Properties::Signals::PropertiesChanged::ArgumentType
-                        args("this.is.unlikely.to.exist.Service",
-                             {{test::Service::Properties::ReadOnly::name(),
-                               core::dbus::types::TypedVariant<test::Service::Properties::ReadOnly::ValueType>(expected_value)}},
-                             {});
-                skeleton->emit_signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged, core::dbus::interfaces::Properties::Signals::PropertiesChanged::ArgumentType>(args);
-                changed_signal->emit(args);
-
                 skeleton->emit_signal<test::Service::Signals::Dummy, int64_t>(expected_value);
             });
 
@@ -132,14 +118,6 @@
             {
                 std::cout << "Dummy property changed: " << d << std::endl;
             });
-
-            auto readonly_property = stub->get_property<test::Service::Properties::ReadOnly>();
-            EXPECT_EQ(readonly_property->get(), 7);
-            std::uint32_t changed_value = 0;
-            readonly_property->changed().connect([&changed_value](std::uint32_t value){
-                changed_value = value;
-            });
-
             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)
@@ -166,8 +144,6 @@
                 t.join();
 
             EXPECT_EQ(expected_value, received_signal_value);
-            EXPECT_EQ(expected_value, readonly_property->get());
-            EXPECT_EQ(changed_value, expected_value);
 
             return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
         };

=== modified file 'tests/test_service.h'
--- tests/test_service.h	2014-06-03 08:25:03 +0000
+++ tests/test_service.h	2014-07-15 22:21:04 +0000
@@ -68,18 +68,6 @@
             static const bool readable = true;
             static const bool writable = true;
         };
-
-        struct ReadOnly
-        {
-            inline static std::string name()
-            {
-                return "ReadOnly";
-            };
-            typedef Service Interface;
-            typedef std::uint32_t ValueType;
-            static const bool readable = true;
-            static const bool writable = false;
-        };
     };
 
     struct Interfaces